diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java index 766da823..d7207339 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java @@ -817,9 +817,12 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl scc.setManager(String.join(",", v)), v -> (List) v); // actFlowCommonService.setListAttribute(mainInstanceId, SENIOR_MANAGER_LIST, v -> scc.setSeniorManager(String.join(",", v)), v -> (List) v); List nodeList = processNodeService.getNodeList(processDefinitionId, mainInstanceId); - scc.setCountersignUser(nodeList.stream().filter(node -> node.getXmlNodeId().equals(COUNTERSIGN)).findFirst().get().getLinkUserIds()); - scc.setManager(nodeList.stream().filter(node -> node.getXmlNodeId().equals(MANAGER_APPROVAL)).findFirst().get().getLinkUserIds()); - scc.setSeniorManager(nodeList.stream().filter(node -> node.getXmlNodeId().equals(SENIOR_MANAGER_APPROVAL)).findFirst().get().getLinkUserIds()); + nodeList.stream().filter(node -> node.getXmlNodeId().equals(COUNTERSIGN)) + .findFirst().ifPresent(node -> scc.setCountersignUser(node.getLinkUserIds())); + nodeList.stream().filter(node -> node.getXmlNodeId().equals(MANAGER_APPROVAL)) + .findFirst().ifPresent(node -> scc.setManager(node.getLinkUserIds())); + nodeList.stream().filter(node -> node.getXmlNodeId().equals(SENIOR_MANAGER_APPROVAL)) + .findFirst().ifPresent(node -> scc.setSeniorManager(node.getLinkUserIds())); } private void setDesignerEngineerEvaluationHandleData(ProcessSccVO processSccVO, String mainInstanceId, String processInstanceId) {