Merge remote-tracking branch 'origin/SecondStage' into SecondStage
This commit is contained in:
+1
-1
@@ -116,7 +116,7 @@ public class CarEsApprovalServiceImpl extends ServiceImpl<ProcessCarEsApprovalMa
|
||||
Map<String, Object> userInfoMap = processInfoVO.getUserInfoMap();
|
||||
Map<String, Object> 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);
|
||||
|
||||
+1
-1
@@ -116,7 +116,7 @@ public class MachineEsApprovalServiceImpl extends ServiceImpl<ProcessMachineEsAp
|
||||
Map<String, Object> userInfoMap = processInfoVO.getUserInfoMap();
|
||||
Map<String, Object> 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);
|
||||
|
||||
+1
-1
@@ -116,7 +116,7 @@ public class SpecialEsApprovalServiceImpl extends ServiceImpl<ProcessSpecialEsAp
|
||||
Map<String, Object> userInfoMap = processInfoVO.getUserInfoMap();
|
||||
Map<String, Object> 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);
|
||||
|
||||
Reference in New Issue
Block a user