From 73b2a698ef81b9de7e3e06adc92bed13ec6aabfe Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Mon, 25 Dec 2023 17:03:48 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E9=A1=B9=E7=9B=AE=E5=90=88=E8=A7=84?=
 =?UTF-8?q?=E8=AF=84=E4=BC=B0=E6=B5=81=E7=A8=8B=20=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=A4=B1=E8=B4=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/ProcessProjectAssessService.java  | 27 ++++++++++++++-----
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessService.java
index 77f7661c..12f6b5fc 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessService.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessService.java
@@ -372,7 +372,9 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
             }
             //去重
             List<String> responsibleUnitLeaderList = Arrays.asList(responsibleUnitLeaders.split(","));
-            List<String> distinctResponsibleUnitLeader = responsibleUnitLeaderList.stream().distinct().collect(Collectors.toList());
+            List<String> distinctResponsibleUnitLeader = responsibleUnitLeaderList.stream()
+                    .filter(Objects::nonNull)
+                    .distinct().collect(Collectors.toList());
             for (String responsibleUnitLeader : distinctResponsibleUnitLeader) {
                 ProcessProjectAssessTermUser processProjectAssessTermUser = new ProcessProjectAssessTermUser();
                 processProjectAssessTermUser.setAssessmentId(assessmentId);
@@ -382,7 +384,9 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
             }
             allResponsibleUnitLeaderList.addAll(distinctResponsibleUnitLeader);
         }
-        List<String> distinctAllResponsibleUnitLeaderList = allResponsibleUnitLeaderList.stream().distinct().collect(Collectors.toList());
+        List<String> distinctAllResponsibleUnitLeaderList = allResponsibleUnitLeaderList.stream()
+                .filter(Objects::nonNull)
+                .distinct().collect(Collectors.toList());
         String distinctAllResponsibleUnitLeaderListJoin = CollectionUtil.join(distinctAllResponsibleUnitLeaderList, ",");
         processProjectAssessTermUserService.saveBatch(saveProcessProjectAssessTermUserList);
 
@@ -468,8 +472,10 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
         wrapper.eq(ProcessProjectAssessTermUser::getAssessmentId, assessmentId);
         wrapper.eq(ProcessProjectAssessTermUser::getResponsibleUnitLeader, originUserId);
         List<ProcessProjectAssessTermUser> projectAssessTermUsers = processProjectAssessTermUserService.list(wrapper);
-        List<String> moduleOwnerList = projectAssessTermUsers.stream().map(ProcessProjectAssessTermUser::getModuleOwner).distinct().collect(Collectors.toList());
-
+        List<String> moduleOwnerList = projectAssessTermUsers.stream()
+                .map(ProcessProjectAssessTermUser::getModuleOwner)
+                .filter(Objects::nonNull)
+                .distinct().collect(Collectors.toList());
         tempCache.put(ProcessProjectAssessCommon.EXECUTION_ID, executionId);
         // 完成任务
         String taskId = processDTO.getTaskId();
@@ -505,7 +511,10 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
         wrapper.eq(ProcessProjectAssessTermUser::getAssessmentId, assessmentId);
         wrapper.eq(ProcessProjectAssessTermUser::getParentExecutionId, formKey);
         List<ProcessProjectAssessTermUser> projectAssessTermUsers = processProjectAssessTermUserService.list(wrapper);
-        List<String> designEngineerList = projectAssessTermUsers.stream().map(ProcessProjectAssessTermUser::getDesignEngineer).distinct().collect(Collectors.toList());
+        List<String> designEngineerList = projectAssessTermUsers.stream()
+                .map(ProcessProjectAssessTermUser::getDesignEngineer)
+                .filter(Objects::nonNull)
+                .distinct().collect(Collectors.toList());
         tempCache.put(ProcessProjectAssessCommon.EXECUTION_ID, executionId);
         processHandleService.saveNodeUserLink(processDTO.getProcessInstanceId(), ProcessProjectAssessCommon.SJGCSPG2, designEngineerList);
         // 完成任务
@@ -727,7 +736,9 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
             }
         }
         processProjectAssessTermUserService.saveBatch(allTermUserList);
-        moduleOwnerIds = moduleOwnerIds.stream().distinct().collect(Collectors.toList());
+        moduleOwnerIds = moduleOwnerIds.stream()
+                .filter(Objects::nonNull)
+                .distinct().collect(Collectors.toList());
         processHandleService.saveNodeUserLink(processDTO.getProcessInstanceId(), ProcessProjectAssessCommon.MKFZRFF, moduleOwnerIds);
         processHandleService.saveNodeUserLink(processDTO.getProcessInstanceId(), ProcessProjectAssessCommon.MKFZRSP, moduleOwnerIds);
         tempCache.put(ProcessProjectAssessCommon.EXECUTION_ID,executionId);
@@ -804,7 +815,9 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
             }
         }
         processProjectAssessTermUserService.saveBatch(allTermUserList);
-        designEngineerIds = designEngineerIds.stream().distinct().collect(Collectors.toList());
+        designEngineerIds = designEngineerIds.stream()
+                .filter(Objects::nonNull)
+                .distinct().collect(Collectors.toList());
         processHandleService.saveNodeUserLink(processDTO.getProcessInstanceId(), ProcessProjectAssessCommon.SJGCSPG, designEngineerIds);
         tempCache.put(ProcessProjectAssessCommon.EXECUTION_ID,executionId);
         // 完成任务