From dacdb572398e7a3410b30f96eaac2ba9ef2412a2 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Wed, 13 Dec 2023 16:25:54 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=B9=B4=E5=BA=A6=E5=88=B6=E4=BF=AE?=
 =?UTF-8?q?=E8=AE=A2=E6=A0=87=E5=87=86=E5=8C=96=E5=8F=91=E8=B5=B7BUG?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ProcessEsAnnualInitServiceImpl.java  | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java
index d1a834e0..ed4748ae 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java
@@ -132,8 +132,8 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl<ProcessEsAnnualI
         Map<String, Object> actVariables = new HashMap<>();
         Map<String, Object> flowUser = annualInitData.getFlowUser();
         List<ProcessEsAnnualInit> dataList = annualInitData.getDataList();
-        List<String> contactUserList = dataList.stream().map(ProcessEsAnnualInit::getContactUser).collect(Collectors.toList());
-        actVariables.put("contactUserList", contactUserList);
+        Set<String> contactUserSet = dataList.stream().map(ProcessEsAnnualInit::getContactUser).collect(Collectors.toSet());
+        actVariables.put("contactUserList", contactUserSet);
         actVariables.put("standardEngineer", flowUser.get("standardEngineer"));
         return actVariables;
     }
@@ -234,7 +234,6 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl<ProcessEsAnnualI
     public void approvalProcess(AnnualInitDataVO annualInitData, boolean pass) {
         String userId = UserUtils.getUserId();
         CommonVO commonVO = annualInitData.getCommonVO();
-        List<ProcessEsAnnualInit> dataList = annualInitData.getDataList();
         String taskId = commonVO.getTaskId();
         // 获取task
         if (StrUtil.isBlank(taskId) && !actFlowCommonService.taskExists(taskId)) {
@@ -245,30 +244,27 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl<ProcessEsAnnualI
         String executionId = task.getExecutionId();
         String taskName = task.getName();
         String processInstanceId = actFlowCommonService.getProcessInstanceIdByTaskId(taskId);
+        List<ProcessEsAnnualInit> dataList;
         switch (taskName) {
             case CONTACT_USER_SELECT:
+                dataList = annualInitData.getDataList();
                 // 处理驳回
                 if (pass) {
                     dataList.forEach(d -> d.setRejectFlag(YesOrNoEnum.NO.getValue()));
                     List<String> approvalUserList = new ArrayList<>();
                     dataList.forEach(d -> approvalUserList.add(d.getApprovalUser()));
                     taskService.setVariable(taskId, "approvalUserList", approvalUserList);
-                } else {
-                    // 更新所有数据为驳回
-                    LambdaQueryWrapper<ProcessEsAnnualInit> wrapper = new LambdaQueryWrapper<>();
-                    wrapper.eq(ProcessEsAnnualInit::getContactUser, userId);
-                    wrapper.eq(ProcessEsAnnualInit::getProcessInstanceId, processInstanceId);
-                    dataList = list(wrapper);
-                    dataList.forEach(d -> d.setRejectFlag(YesOrNoEnum.YES.getValue()));
                 }
                 dataList.forEach(data -> data.setExecutionId(executionId));
                 saveOrUpdateBatch(dataList);
                 break;
             case STANDARD_ENGINEER_EDIT:
+                dataList = annualInitData.getDataList();
                 dataList.forEach(d -> d.setRejectFlag(YesOrNoEnum.NO.getValue()));
                 saveOrUpdateBatch(dataList);
                 break;
             case MAIN_DRAFT_LEADER_APPROVAL:
+                dataList = annualInitData.getDataList();
                 // 如果不驳回
                 if (pass) {
                     dataList.forEach(d -> d.setRejectFlag(YesOrNoEnum.NO.getValue()));
@@ -284,13 +280,16 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl<ProcessEsAnnualI
                 saveOrUpdateBatch(dataList);
                 break;
             case MAIN_DRAFT_WRITE:
+                dataList = annualInitData.getDataList();
                 dataList.forEach(d -> d.setMainDraftingUser(userId));
                 saveOrUpdateBatch(dataList);
                 break;
             case CONTACT_USER_COLLECT:
+                dataList = annualInitData.getDataList();
                 saveOrUpdateBatch(dataList);
                 break;
             case MAIN_DRAFT_LEADER_LEADER_APPROVAL:
+                dataList = annualInitData.getDataList();
                 // 如果不驳回
                 if (pass) {
                     dataList.forEach(d -> d.setRejectFlag(YesOrNoEnum.NO.getValue()));
@@ -303,6 +302,7 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl<ProcessEsAnnualI
                 break;
             case STANDARD_ENGINEER_COLLECT:
                 // 根据流程ID删除所有数据后新增
+                dataList = annualInitData.getDataList();
                 LambdaQueryWrapper<ProcessEsAnnualInit> wrapper = new LambdaQueryWrapper<>();
                 wrapper.eq(ProcessEsAnnualInit::getProcessInstanceId, processInstanceId);
                 remove(wrapper);