From f6053aa743574c16d08c3ce99436bd497a39a145 Mon Sep 17 00:00:00 2001
From: pengjie <17373303529@163.com>
Date: Tue, 11 Jun 2024 23:38:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=91=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../basicdata/service/impl/SystemUserServiceImpl.java    | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java
index 6313c1e6d..76a87748d 100644
--- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java
@@ -920,6 +920,7 @@ public class SystemUserServiceImpl extends ServiceImpl<SystemUserMapper, SystemU
             // 判断是否存在工作流的流程中
             List<HistoricProcessInstance> list = historyService.createHistoricProcessInstanceQuery().unfinished().list();
             Set<String> processDefinitionId = list.stream().map(l -> l.getProcessDefinitionId()).collect(Collectors.toSet());
+            Set<String> startUserIds = list.stream().map(l -> l.getStartUserId()).collect(Collectors.toSet());
             List<WflowModels> models = wflowModelsMapper.selectList(Wrappers.<WflowModels>lambdaQuery()
                     .in(WflowModels::getProcessDefId, processDefinitionId));
             List<String> modelName = new ArrayList<>();
@@ -934,10 +935,13 @@ public class SystemUserServiceImpl extends ServiceImpl<SystemUserMapper, SystemU
                     }
                 }
                 getUserIds(process.getJSONObject("children"), userIds);
-                if (userIds.contains(systemUser.getUserId())) {
+                if (userIds.contains(systemUser.getUserId().toString())) {
                     modelName.add(model.getFormName());
                 }
             }
+            if (startUserIds.contains(systemUser.getUserId().toString())) {
+                throw new OpenAlertException("该人员有正在进行中的审批流程,不可修改组织机构信息,请完成流程后再进行修改");
+            }
             if (modelName.size() > 0) {
                 throw new OpenAlertException("该人员有正在进行中的审批流程,不可修改组织机构信息,请完成流程后再进行修改");
             }
@@ -1254,6 +1258,7 @@ public class SystemUserServiceImpl extends ServiceImpl<SystemUserMapper, SystemU
         // 判断是否存在工作流的流程中
         List<HistoricProcessInstance> list = historyService.createHistoricProcessInstanceQuery().unfinished().list();
         Set<String> processDefinitionId = list.stream().map(l -> l.getProcessDefinitionId()).collect(Collectors.toSet());
+        Set<String> startUserIds = list.stream().map(l -> l.getStartUserId()).collect(Collectors.toSet());
         List<WflowModels> models = wflowModelsMapper.selectList(Wrappers.<WflowModels>lambdaQuery()
                 .in(WflowModels::getProcessDefId, processDefinitionId));
         List<String> modelName = new ArrayList<>();
@@ -1273,7 +1278,7 @@ public class SystemUserServiceImpl extends ServiceImpl<SystemUserMapper, SystemU
             }
         }
         StringBuilder stringBuilder = new StringBuilder("该人员有正在进行中的");
-        if (modelName.size() > 0) {
+        if (modelName.size() > 0 || startUserIds.contains(id)) {
             stringBuilder.append("审批流程");
         }
         // 判断是否存在安全检查中