admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

人员修改

Browse Source
This commit is contained in:
pengjie 2024-06-11 23:38:58 +08:00
parent 7b38ec38e4
commit f6053aa743
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java
View File

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