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 list = historyService.createHistoricProcessInstanceQuery().unfinished().list(); Set processDefinitionId = list.stream().map(l -> l.getProcessDefinitionId()).collect(Collectors.toSet()); + Set startUserIds = list.stream().map(l -> l.getStartUserId()).collect(Collectors.toSet()); List models = wflowModelsMapper.selectList(Wrappers.lambdaQuery() .in(WflowModels::getProcessDefId, processDefinitionId)); List modelName = new ArrayList<>(); @@ -934,10 +935,13 @@ public class SystemUserServiceImpl extends ServiceImpl 0) { throw new OpenAlertException("该人员有正在进行中的审批流程,不可修改组织机构信息,请完成流程后再进行修改"); } @@ -1254,6 +1258,7 @@ public class SystemUserServiceImpl extends ServiceImpl list = historyService.createHistoricProcessInstanceQuery().unfinished().list(); Set processDefinitionId = list.stream().map(l -> l.getProcessDefinitionId()).collect(Collectors.toSet()); + Set startUserIds = list.stream().map(l -> l.getStartUserId()).collect(Collectors.toSet()); List models = wflowModelsMapper.selectList(Wrappers.lambdaQuery() .in(WflowModels::getProcessDefId, processDefinitionId)); List modelName = new ArrayList<>(); @@ -1273,7 +1278,7 @@ public class SystemUserServiceImpl extends ServiceImpl 0) { + if (modelName.size() > 0 || startUserIds.contains(id)) { stringBuilder.append("审批流程"); } // 判断是否存在安全检查中