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)) {