From 46a9e76fc1fe9c58d98b0f134ce0af0df3cd04f5 Mon Sep 17 00:00:00 2001
From: lijiarao <136157943@qq.com>
Date: Sat, 3 Feb 2024 18:06:31 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E6=B5=81=E7=A8=8B=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../projectassess/service/ProcessProjectAssessService.java | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

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 326b6604..59916210 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
@@ -953,6 +953,7 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
         ProcessProjectAssessVO businessInfoDTO = processInfoVO.getBusinessInfoDTO();
         List<ProcessProjectAssessTerm> processProjectAssessTermList = businessInfoDTO.getProcessProjectAssessTermList();
         List<ProcessProjectAssessTermUser> allTermUserList = new ArrayList<>();
+        String moduleOwner = null;
         for (ProcessProjectAssessTerm processProjectAssessTerm : processProjectAssessTermList) {
             ProcessProjectAssessTermUser termUser = new ProcessProjectAssessTermUser();
             termUser.setId(processProjectAssessTerm.getTermUserId());
@@ -969,6 +970,8 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
             termUser.setAssessTime(date);
 
             allTermUserList.add(termUser);
+            String moduleOwner1 = processProjectAssessTerm.getModuleOwner();
+            moduleOwner = moduleOwner1;
         }
         processProjectAssessTermUserService.updateBatchById(allTermUserList);
         ThreadLocalUtil.put(ProcessProjectAssessCommon.EXECUTION_ID,executionId);
@@ -976,7 +979,9 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
         // 完成任务
         String taskId = processDTO.getTaskId();
         Map<String, Object> variables = new HashMap<>();
-        variables.put(ProcessProjectAssessCommon.MODULE_OWNER, processProjectAssessTermList.get(0).getModuleOwner());
+        if (StringUtils.isNotBlank(moduleOwner)){
+            variables.put(ProcessProjectAssessCommon.MODULE_OWNER, moduleOwner);
+        }
         taskService.complete(taskId,variables);
         ThreadLocalUtil.remove();