From 0cbdb10e81f988a010145bcc03102e52f2c9dde5 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Mon, 18 Dec 2023 10:37:39 +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=E8=81=94=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/ProcessProjectAssessService.java           | 10 +++++++++-
 .../activiti/service/ProcessApprovalRecordService.java |  5 +++--
 2 files changed, 12 insertions(+), 3 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 78034ca6..2495d487 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
@@ -49,6 +49,8 @@ import com.jero.modules.activiti.process.projectassess.entity.ProcessProjectAsse
 import com.jero.modules.activiti.process.projectassess.mapper.ProcessProjectAssessMapper;
 import org.springframework.transaction.annotation.Transactional;
 
+import static org.apache.tools.ant.taskdefs.SetPermissions.NonPosixMode.pass;
+
 /**
  * @author liJiaRao
  * @date 2023-12-05 15:57
@@ -528,6 +530,10 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
             allTermUserList.add(termUser);
         }
         processProjectAssessTermUserService.updateBatchById(allTermUserList);
+        ProcessProjectAssessTermUser byId = processProjectAssessTermUserService.getById(allTermUserList.get(0).getId());
+
+        runtimeService.setVariable(task.getProcessInstanceId(), "moduleOwner", byId.getModuleOwner());
+
         // 完成任务
         String taskId = processDTO.getTaskId();
         taskService.complete(taskId);
@@ -581,6 +587,7 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
         String assignee = delegateTask.getAssignee();
         String processInstanceId = delegateTask.getProcessInstanceId();
         String nodeId = null;
+        String userId = null;
         switch (taskDefinitionKey) {
             //模块负责人分发
             case ProcessProjectAssessCommon.MKFZRFF:
@@ -593,6 +600,7 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
             //模块负责人审批
             case ProcessProjectAssessCommon.MKFZRSP:
                 nodeId = ProcessProjectAssessCommon.MKFZRFF;
+                userId = (String) runtimeService.getVariable(processInstanceId, "moduleOwner");
                 break;
                 //模块负责人修改
             case ProcessProjectAssessCommon.MKFZRXG:
@@ -601,7 +609,7 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
             default:
         }
         //查询我最新提交的task
-        ProcessApprovalRecord myLastComplete = processApprovalRecordService.getMyLastComplete(processInstanceId, nodeId);
+        ProcessApprovalRecord myLastComplete = processApprovalRecordService.getMyLastComplete(processInstanceId, nodeId, userId);
         String lastCompleteTaskId = myLastComplete.getTaskId();
         HistoricTaskInstance historicTaskInstance = historyService.createHistoricTaskInstanceQuery().taskId(lastCompleteTaskId).singleResult();
         String executionId = historicTaskInstance.getExecutionId();
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessApprovalRecordService.java b/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessApprovalRecordService.java
index e3d72846..ca5621ed 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessApprovalRecordService.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessApprovalRecordService.java
@@ -53,10 +53,11 @@ public class ProcessApprovalRecordService extends ServiceImpl<ProcessApprovalRec
         return pageList;
     }
 
-    public ProcessApprovalRecord getMyLastComplete(String processInstanceId,String nodeId) {
+    public ProcessApprovalRecord getMyLastComplete(String processInstanceId, String nodeId, String userId) {
         LambdaQueryWrapper<ProcessApprovalRecord> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(ProcessApprovalRecord::getProcessInstanceId,processInstanceId);
-        wrapper.eq(ProcessApprovalRecord::getUserId, CurrentUserUtil.getId());
+        wrapper.eq(StringUtils.isBlank(userId),ProcessApprovalRecord::getUserId, CurrentUserUtil.getId());
+        wrapper.eq(!StringUtils.isBlank(userId),ProcessApprovalRecord::getUserId, userId);
         wrapper.eq(ProcessApprovalRecord::getFinishFlag,FinishFlagEnum.COMPLETE.getValue());
         wrapper.eq(StringUtils.isNotBlank(nodeId), ProcessApprovalRecord::getNodeId,nodeId);
         wrapper.orderByDesc(ProcessApprovalRecord::getEndTime);