From 7d1dcd74604d8a1b4369cf2f966cc6b628893fc7 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期三, 17 七月 2024 11:13:43 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportingWorkController.java | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportingWorkController.java b/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportingWorkController.java
index f96ec19..fa1191e 100644
--- a/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportingWorkController.java
+++ b/north-glass-erp/src/main/java/com/example/erp/controller/pp/ReportingWorkController.java
@@ -26,6 +26,7 @@
}
@ApiOperation("鎶ュ伐鏂板鏌ヨ")
+ @SaCheckPermission("AddReportingWork.search")
@PostMapping ("/addSelectLastWork/{processIdStr}/{technologyStr}/{process}")
public Result AddSelectLastWork(
@PathVariable String processIdStr,
@@ -83,12 +84,14 @@
@SaCheckPermission("SelectReportingWorks.delete")
@PostMapping("/deleteWork/{reportingWorkId}/{processId}/{thisProcess}")
public Result deleteWork(@PathVariable String reportingWorkId,@PathVariable String processId,@PathVariable String thisProcess){
- if(reportingWorkService.deleteWorkSv(reportingWorkId,processId,thisProcess)){
- return Result.seccess();
- }else {
- throw new ServiceException(Constants.Code_500,"鍒犻櫎澶辫触,璇锋鏌ユ槸鍚︾鍚堝垹闄ゆ潯浠�");
+// if(reportingWorkService.deleteWorkSv(reportingWorkId,processId,thisProcess)){
+// return Result.seccess();
+// }else {
+// throw new ServiceException(Constants.Code_500,"鍒犻櫎澶辫触,璇锋鏌ユ槸鍚︾鍚堝垹闄ゆ潯浠�");
+//
+// }
+ return Result.seccess(reportingWorkService.deleteWorkSv(reportingWorkId,processId,thisProcess));
- }
}
@ApiOperation("璐ㄦ瀹℃牳鏌ヨ鎺ュ彛")
--
Gitblit v1.8.0