From dd13201ce341b47ebb86697c3d0df0fbb6fe7d65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= Date: Wed, 9 Oct 2024 10:57:23 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=85=B3=E9=94=AE=E9=9B=B6?= =?UTF-8?q?=E9=83=A8=E4=BB=B6=E5=9E=8B=E5=8F=B7=E7=94=B3=E8=AF=B7=E6=B5=81?= =?UTF-8?q?=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ProcessPartTypeApplyRecordController.java | 2 ++ .../part/service/impl/ProcessPartTypeApplyServiceImpl.java | 5 +---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/part/controller/ProcessPartTypeApplyRecordController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/part/controller/ProcessPartTypeApplyRecordController.java index c5bb41d8..f3b82caf 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/part/controller/ProcessPartTypeApplyRecordController.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/part/controller/ProcessPartTypeApplyRecordController.java @@ -114,6 +114,7 @@ public class ProcessPartTypeApplyRecordController { @ApiOperation(value = "业务支持-关键零部件型号库-新增", notes = "业务支持-关键零部件型号库-新增") @ApiOperationSupport(order = 5) @PostMapping(value = "/add") + @Translation // @RequiresPermissions("keyPartBindingManage:add") public Result add(@RequestBody ProcessPartTypeApplyRecord processPartTypeApplyRecord) { return Result.OK(processPartTypeApplyRecordService.add(processPartTypeApplyRecord)); @@ -130,6 +131,7 @@ public class ProcessPartTypeApplyRecordController { @ApiOperationSupport(order = 6) @PostMapping(value = "/edit") // @RequiresPermissions("keyPartBindingManage:import") + @Translation public Result edit(@Validated @RequestBody ProcessPartTypeApplyRecord processPartTypeApplyRecord) { return Result.OK(this.processPartTypeApplyRecordService.edit(processPartTypeApplyRecord)); } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/part/service/impl/ProcessPartTypeApplyServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/part/service/impl/ProcessPartTypeApplyServiceImpl.java index 941e65d0..5ec40b7b 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/part/service/impl/ProcessPartTypeApplyServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/part/service/impl/ProcessPartTypeApplyServiceImpl.java @@ -129,10 +129,7 @@ public class ProcessPartTypeApplyServiceImpl extends ServiceImpl map = new HashMap<>(); // 人员信息 userInfoMap.forEach((key, value) -> { - if(Objects.equals("checkUserLeader1List",key + "List") || - Objects.equals("checkUserLeader2List",key + "List") || - Objects.equals("checkUserLeader3List",key + "List") || - Objects.equals("checkUserLeader4List",key + "List")){ + if(Objects.equals("designUserLeader",key)){ map.put(key, value); map.put(key + "List", Arrays.asList(value.toString().split(","))); return;