From d3185da3dac2c3d84cc1637516e0afeae7f78583 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Tue, 19 Dec 2023 18:19:58 +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=EF=BC=8C=E8=8A=82=E7=82=B93=E9=A9=B3=E5=9B=9E?=
 =?UTF-8?q?=E5=88=B0=E8=8A=82=E7=82=B92=EF=BC=8C=E8=8A=82=E7=82=B92?=
 =?UTF-8?q?=E5=9C=A8=E9=A9=B3=E5=9B=9E=E5=88=B0=E8=8A=82=E7=82=B91?=
 =?UTF-8?q?=EF=BC=8C=E8=8A=82=E7=82=B91=E6=96=B0=E5=A2=9E=E4=BA=86?=
 =?UTF-8?q?=E4=B8=80=E6=9D=A1=E6=95=B0=E6=8D=AE=E5=88=B0=E4=BA=86=E8=8A=82?=
 =?UTF-8?q?=E7=82=B92=E6=B2=A1=E6=9C=89=E9=82=A3=E6=9D=A1=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ProcessEsAnnualInitServiceImpl.java           | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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 93713d00..ad7cc880 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
@@ -209,7 +209,6 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl<ProcessEsAnnualI
                 break;
             case STANDARD_ENGINEER_SECOND_EDIT:
                 wrapper.eq(ProcessEsAnnualInit::getExecutionId, executionId);
-                wrapper.eq(ProcessEsAnnualInit::getApprovalUser, approvalUser);
                 wrapper.eq(ProcessEsAnnualInit::getRejectSecondFlag, YesOrNoEnum.YES.getValue());
                 break;
             case STANDARD_ENGINEER_EDIT:
@@ -306,6 +305,8 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl<ProcessEsAnnualI
             case STANDARD_ENGINEER_SECOND_EDIT:
                 dataList = annualInitData.getDataList();
                 dataList.forEach(d -> d.setRejectSecondFlag(YesOrNoEnum.NO.getValue()));
+                dataList.forEach(d -> d.setRejectFlag(YesOrNoEnum.YES.getValue()));
+                dataList.forEach(d -> d.setExecutionId(executionId));
                 // 先删后增
                 if (batchDelFlag) {
                     saveOrUpdateBatch(dataList);