From 39d91d961d25fb13236ffead519d3899a2fe6779 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Fri, 15 Dec 2023 18:18:20 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=A0=87=E5=87=86=E5=8C=96=E5=8F=91?=
 =?UTF-8?q?=E8=B5=B7=E6=B5=81=E7=A8=8B=E6=95=B0=E6=8D=AE=E6=B5=81=E8=BD=AC?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=B8=A2=E5=A4=B1BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/AnnualInitTaskNameConstant.java          |  4 ++--
 .../impl/ProcessEsAnnualInitServiceImpl.java        | 13 +++++++------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/entity/AnnualInitTaskNameConstant.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/entity/AnnualInitTaskNameConstant.java
index 051cf416..1e63f2aa 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/entity/AnnualInitTaskNameConstant.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/entity/AnnualInitTaskNameConstant.java
@@ -9,10 +9,10 @@ public class AnnualInitTaskNameConstant {
     public static final String STANDARD_ENGINEER_INIT = "标准化工程师发起";
     public static final String CONTACT_USER_SELECT = "部所联络人选取审批人";
     public static final String STANDARD_ENGINEER_EDIT = "标准化工程师修改调整";
-    public static final String MAIN_DRAFT_LEADER_APPROVAL = "主起草单位主管级领导审批下发";
+    public static final String MAIN_DRAFT_LEADER_APPROVAL_DISTRIBUTE = "主起草单位主管级领导审批下发";
     public static final String CONTACT_USER_EDIT = "部所联络人修改调整";
     public static final String MAIN_DRAFT_WRITE = "主起草人填写信息";
     public static final String CONTACT_USER_COLLECT = "部所联络人汇总";
-    public static final String MAIN_DRAFT_LEADER_LEADER_APPROVAL = "主起草单位主管级领导审批";
+    public static final String MAIN_DRAFT_LEADER_APPROVAL = "主起草单位主管级领导审批";
     public static final String STANDARD_ENGINEER_COLLECT = "标准化归档";
 }
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 0705a404..e1b86418 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
@@ -210,7 +210,6 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl<ProcessEsAnnualI
         Task task = taskService.createTaskQuery().taskId(taskId).singleResult();
         String taskName = task.getName();
         String contactUser = (String) runtimeService.getVariable(executionId, "contactUser");
-        String workGroupUser = (String) runtimeService.getVariable(executionId, "workGroupUser");
         switch (taskName) {
             case CONTACT_USER_SELECT:
                 wrapper.eq(ProcessEsAnnualInit::getContactUser, userId);
@@ -219,7 +218,7 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl<ProcessEsAnnualI
                 wrapper.eq(ProcessEsAnnualInit::getExecutionId, executionId);
                 wrapper.eq(ProcessEsAnnualInit::getRejectFlag, YesOrNoEnum.YES.getValue());
                 break;
-            case MAIN_DRAFT_LEADER_APPROVAL:
+            case MAIN_DRAFT_LEADER_APPROVAL_DISTRIBUTE:
                 wrapper.eq(ProcessEsAnnualInit::getContactUser, contactUser);
                 wrapper.eq(ProcessEsAnnualInit::getApprovalUser, userId);
                 break;
@@ -233,8 +232,10 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl<ProcessEsAnnualI
                 wrapper.eq(ProcessEsAnnualInit::getContactUser, userId);
                 wrapper.eq(ProcessEsAnnualInit::getExecutionId, executionId);
                 break;
-            case MAIN_DRAFT_LEADER_LEADER_APPROVAL:
-                wrapper.eq(ProcessEsAnnualInit::getContactUser, userId);
+            case MAIN_DRAFT_LEADER_APPROVAL:
+                wrapper.eq(ProcessEsAnnualInit::getContactUser, contactUser);
+                wrapper.eq(ProcessEsAnnualInit::getApprovalUser, userId);
+                wrapper.eq(ProcessEsAnnualInit::getExecutionId, executionId);
                 break;
             case STANDARD_ENGINEER_COLLECT:
                 // do nothing now
@@ -296,7 +297,7 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl<ProcessEsAnnualI
                 dataList.forEach(d -> d.setRejectFlag(YesOrNoEnum.NO.getValue()));
                 saveOrUpdateBatch(dataList);
                 break;
-            case MAIN_DRAFT_LEADER_APPROVAL:
+            case MAIN_DRAFT_LEADER_APPROVAL_DISTRIBUTE:
                 dataList = annualInitData.getDataList();
                 // 如果不驳回
                 if (pass) {
@@ -322,7 +323,7 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl<ProcessEsAnnualI
                 dataList = annualInitData.getDataList();
                 saveOrUpdateBatch(dataList);
                 break;
-            case MAIN_DRAFT_LEADER_LEADER_APPROVAL:
+            case MAIN_DRAFT_LEADER_APPROVAL:
                 dataList = annualInitData.getDataList();
                 // 如果不驳回
                 if (pass) {