From 32eaa457c282b197df8598dd5a6728b33dd670b7 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Tue, 19 Dec 2023 14:12:54 +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=E4=BA=8C=E6=AC=A1=E9=A9=B3=E5=9B=9E=E5=90=8E?=
 =?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

---
 .../service/impl/ProcessEsAnnualInitServiceImpl.java          | 4 +---
 1 file changed, 1 insertion(+), 3 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 148aaf3a..0afd7163 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
@@ -222,7 +222,6 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl<ProcessEsAnnualI
                 break;
             case CONTACT_USER_EDIT:
                 wrapper.eq(ProcessEsAnnualInit::getContactUser, contactUser);
-                wrapper.eq(ProcessEsAnnualInit::getApprovalUser, approvalUser);
                 wrapper.eq(ProcessEsAnnualInit::getRejectFlag, YesOrNoEnum.YES.getValue());
                 break;
             case MAIN_DRAFT_WRITE:
@@ -306,7 +305,7 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl<ProcessEsAnnualI
                 break;
             case STANDARD_ENGINEER_SECOND_EDIT:
                 dataList = annualInitData.getDataList();
-                dataList.forEach(d -> d.setRejectFlag(YesOrNoEnum.NO.getValue()));
+                dataList.forEach(d -> d.setRejectSecondFlag(YesOrNoEnum.NO.getValue()));
                 // 先删后增
                 if (batchDelFlag) {
                     saveOrUpdateBatch(dataList);
@@ -316,7 +315,6 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl<ProcessEsAnnualI
                     wrapper.eq(ProcessEsAnnualInit::getRejectSecondFlag, YesOrNoEnum.YES.getValue());
                     remove(wrapper);
                     dataList.forEach(data -> data.setProcessInstanceId(processInstanceId));
-                    dataList.forEach(data -> data.setExecutionId(executionId));
                     saveBatch(dataList);
                 }
                 break;