From 8ccddb9a0210b5ec18069c60eb074158a53057f1 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Wed, 20 Dec 2023 10:34:38 +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=B7=20?= =?UTF-8?q?=E9=A2=86=E5=AF=BC=E9=A9=B3=E5=9B=9E=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ProcessEsAnnualInitServiceImpl.java | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 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 80330243..10653464 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 @@ -401,13 +401,18 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl d.setRejectFlag(YesOrNoEnum.NO.getValue())); + updateWrapper.eq(ProcessEsAnnualInit::getContactUser, contactUser); + updateWrapper.eq(ProcessEsAnnualInit::getApprovalUser, approvalUser); + updateWrapper.set(ProcessEsAnnualInit::getRejectFlag, YesOrNoEnum.NO.getValue()); + updateWrapper.set(ProcessEsAnnualInit::getExecutionId, executionId); + update(updateWrapper); } else { - dataList.forEach(d -> d.setRejectFlag(YesOrNoEnum.YES.getValue())); + updateWrapper.eq(ProcessEsAnnualInit::getContactUser, contactUser); + updateWrapper.eq(ProcessEsAnnualInit::getApprovalUser, approvalUser); + updateWrapper.set(ProcessEsAnnualInit::getRejectFlag, YesOrNoEnum.YES.getValue()); + updateWrapper.set(ProcessEsAnnualInit::getExecutionId, executionId); + update(updateWrapper); } - // 获取执行id - dataList.forEach(data -> data.setExecutionId(executionId)); - saveOrUpdateBatch(dataList); break; case STANDARD_ENGINEER_COLLECT: // 根据流程ID删除所有数据后新增