From b6a32a3da4ca139fac7b3d90c93cfc9e32553bd6 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Mon, 14 Oct 2024 10:46:39 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=B8=89=E4=B8=AA?= =?UTF-8?q?=E5=AE=A1=E6=89=B9=E6=B5=81=E7=A8=8B=E5=8F=91=E8=B5=B7=E6=8A=A5?= =?UTF-8?q?=E9=94=99=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 修改了CarEsApprovalServiceImpl、MachineEsApprovalServiceImpl和SpecialEsApprovalServiceImpl中的用户信息处理逻辑。将MAIN_DRAFT_USER的值从userInfoMap复制到result映射中，而不是直接在userInfoMap中进行操作，优化了多选人员转换为List并放入map的处理流程。 --- .../carEsApproval/service/impl/CarEsApprovalServiceImpl.java | 2 +- .../service/impl/MachineEsApprovalServiceImpl.java | 2 +- .../service/impl/SpecialEsApprovalServiceImpl.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/carEsApproval/service/impl/CarEsApprovalServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/carEsApproval/service/impl/CarEsApprovalServiceImpl.java index 8c5abc5d..8a72aad7 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/carEsApproval/service/impl/CarEsApprovalServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/carEsApproval/service/impl/CarEsApprovalServiceImpl.java @@ -116,7 +116,7 @@ public class CarEsApprovalServiceImpl extends ServiceImpl userInfoMap = processInfoVO.getUserInfoMap(); Map result = new HashMap<>(); // 将所有多选人员转换为List后放入map中 - userInfoMap.put(MAIN_DRAFT_USER, userInfoMap.get(MAIN_DRAFT_USER)); + result.put(MAIN_DRAFT_USER, userInfoMap.get(MAIN_DRAFT_USER)); actFlowCommonService.convertAndPutList(result, userInfoMap, USER_ONE_List); actFlowCommonService.convertAndPutList(result, userInfoMap, USER_TWO_List); actFlowCommonService.convertAndPutList(result, userInfoMap, USER_THREE_List); diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/machineEsApproval/service/impl/MachineEsApprovalServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/machineEsApproval/service/impl/MachineEsApprovalServiceImpl.java index b9945fee..784ab6fe 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/machineEsApproval/service/impl/MachineEsApprovalServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/machineEsApproval/service/impl/MachineEsApprovalServiceImpl.java @@ -116,7 +116,7 @@ public class MachineEsApprovalServiceImpl extends ServiceImpl userInfoMap = processInfoVO.getUserInfoMap(); Map result = new HashMap<>(); // 将所有多选人员转换为List后放入map中 - userInfoMap.put(MAIN_DRAFT_USER, userInfoMap.get(MAIN_DRAFT_USER)); + result.put(MAIN_DRAFT_USER, userInfoMap.get(MAIN_DRAFT_USER)); actFlowCommonService.convertAndPutList(result, userInfoMap, USER_ONE_List); actFlowCommonService.convertAndPutList(result, userInfoMap, USER_TWO_List); actFlowCommonService.convertAndPutList(result, userInfoMap, USER_THREE_List); diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/specialEsApproval/service/impl/SpecialEsApprovalServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/specialEsApproval/service/impl/SpecialEsApprovalServiceImpl.java index 57c5c5d8..5f5b8b6c 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/specialEsApproval/service/impl/SpecialEsApprovalServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/specialEsApproval/service/impl/SpecialEsApprovalServiceImpl.java @@ -116,7 +116,7 @@ public class SpecialEsApprovalServiceImpl extends ServiceImpl userInfoMap = processInfoVO.getUserInfoMap(); Map result = new HashMap<>(); // 将所有多选人员转换为List后放入map中 - userInfoMap.put(MAIN_DRAFT_USER, userInfoMap.get(MAIN_DRAFT_USER)); + result.put(MAIN_DRAFT_USER, userInfoMap.get(MAIN_DRAFT_USER)); actFlowCommonService.convertAndPutList(result, userInfoMap, USER_ONE_List); actFlowCommonService.convertAndPutList(result, userInfoMap, USER_TWO_List); actFlowCommonService.convertAndPutList(result, userInfoMap, USER_THREE_List);