From 3c9ade1ce5a5c122e13bfb6b4eea08e939d1467b Mon Sep 17 00:00:00 2001 From: caihaohan Date: Thu, 22 Aug 2024 17:48:47 +0800 Subject: [PATCH] =?UTF-8?q?fix:=2089277=20=E6=B3=95=E8=A7=84=E7=AC=A6?= =?UTF-8?q?=E5=90=88=E6=80=A7=E6=8E=92=E6=9F=A5=E6=B5=81=E7=A8=8B--?= =?UTF-8?q?=E4=B8=BB=E6=8E=92=E6=9F=A5=E4=BA=BA--=E5=88=86=E5=8F=91?= =?UTF-8?q?=E8=8A=82=E7=82=B9=E9=80=89=E6=8B=A9=E4=BA=BA=E5=91=98=E4=BF=9D?= =?UTF-8?q?=E5=AD=98=E5=90=8E=E8=BD=AC=E5=8A=9E=EF=BC=8C=E5=90=8E=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E6=95=B0=E6=8D=AE=E4=B8=BA=E7=A9=BA=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fb/service/impl/ProcessHandleServiceImpl.java | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessHandleServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessHandleServiceImpl.java index edd80050..7b0893f8 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessHandleServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessHandleServiceImpl.java @@ -45,6 +45,8 @@ import javax.annotation.Resource; import java.util.*; import java.util.stream.Collectors; +import static com.jero.modules.activiti.process.standardComplianceCheck.common.ProcessStandardComplianceCheckConstants.MAIN_CHECK_USER_DISTRIBUTE; + /** * @Author: liao * @Date: 2023/11/2 17:01 @@ -441,7 +443,13 @@ public class ProcessHandleServiceImpl implements IProcessHandleService { processDraft.setSaveSource(processInfoVO.getSaveSource());//来源（启动流程时有用，用于保存初始业务信息用于强制驳回） processDraftService.saveOrUpdate(processDraft); - if (basicProcessInfoDTO.getProcessType().equals(ProcessTypeEnum.STANDARD_COMPLIANCE_CHECK.getValue())) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(ProcessApprovalRecord::getProcessInstanceId, basicProcessInfoDTO.getProcessInstanceId()); + queryWrapper.eq(ProcessApprovalRecord::getTaskId, taskId); + ProcessApprovalRecord one = processApprovalRecordService.getOne(queryWrapper); + + if (basicProcessInfoDTO.getProcessType().equals(ProcessTypeEnum.STANDARD_COMPLIANCE_CHECK.getValue()) && + one.getNodeId().equals(MAIN_CHECK_USER_DISTRIBUTE)) { try { LinkedHashMap businessInfoDTO = (LinkedHashMap) processInfoVO.getBusinessInfoDTO(); @@ -459,8 +467,8 @@ public class ProcessHandleServiceImpl implements IProcessHandleService { String jsonString = objectMapper.writeValueAsString(detailInfoMapList); // 将 JSON 字符串反序列化为 List - List detailInfoList = objectMapper.readValue(jsonString, new TypeReference>() { - }); + List detailInfoList = objectMapper.readValue(jsonString, new TypeReference>() {}); + detailInfoList.forEach(detail -> detail.setDesignEngineer(null)); List ids = detailInfoList.stream().map(ProcessStandardComplianceCheckDetail::getId).collect(Collectors.toList()); // 先删后增 if (CollUtil.isNotEmpty(ids)) {