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

Merge remote-tracking branch 'origin/guoshengxiong' into guoshengxiong

Browse Source
This commit is contained in:
guoshengxiong 2024-07-02 17:04:08 +08:00
commit d929e896c4
1 changed files with 112 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -911,6 +911,7 @@ public class SystemUserServiceImpl extends ServiceImpl<SystemUserMapper, SystemU
if (!systemUser1.getXzProjectOrgId().toString().equals(systemUser.getXzProjectOrgId().toString())) { if (!systemUser1.getXzProjectOrgId().toString().equals(systemUser.getXzProjectOrgId().toString())) {
// 判断是否存在工作流的流程中 // 判断是否存在工作流的流程中
List<HistoricProcessInstance> list = historyService.createHistoricProcessInstanceQuery().unfinished().list(); List<HistoricProcessInstance> list = historyService.createHistoricProcessInstanceQuery().unfinished().list();
if (list.size() > 0) {
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()); 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()
@ -938,6 +939,7 @@ public class SystemUserServiceImpl extends ServiceImpl<SystemUserMapper, SystemU
throw new OpenAlertException("该人员有正在进行中的审批流程,不可修改组织机构信息,请完成流程后再进行修改"); throw new OpenAlertException("该人员有正在进行中的审批流程,不可修改组织机构信息,请完成流程后再进行修改");
} }
} }
}
QueryWrapper<SystemUser> queryWrapper = new QueryWrapper<>(); QueryWrapper<SystemUser> queryWrapper = new QueryWrapper<>();
queryWrapper.lambda().eq(SystemUser::getAccount, systemUser.getAccount()) queryWrapper.lambda().eq(SystemUser::getAccount, systemUser.getAccount())
.ne(SystemUser::getUserId, systemUser.getUserId()); .ne(SystemUser::getUserId, systemUser.getUserId());
@ -1249,6 +1251,7 @@ public class SystemUserServiceImpl extends ServiceImpl<SystemUserMapper, SystemU
String id = MapUtils.getString(map, "id"); String id = MapUtils.getString(map, "id");
// 判断是否存在工作流的流程中 // 判断是否存在工作流的流程中
List<HistoricProcessInstance> list = historyService.createHistoricProcessInstanceQuery().unfinished().list(); List<HistoricProcessInstance> list = historyService.createHistoricProcessInstanceQuery().unfinished().list();
if (list.size() > 0) {
Set<String> processDefinitionId = list.stream().map(l -> l.getProcessDefinitionId()).collect(Collectors.toSet()); Set<String> processDefinitionId = list.stream().map(l -> l.getProcessDefinitionId()).collect(Collectors.toSet());
StringBuilder stringBuilder = new StringBuilder("该人员有正在进行中的"); StringBuilder stringBuilder = new StringBuilder("该人员有正在进行中的");
List<String> modelName = new ArrayList<>(); List<String> modelName = new ArrayList<>();
@ -1350,6 +1353,7 @@ public class SystemUserServiceImpl extends ServiceImpl<SystemUserMapper, SystemU
if (modelName.size() > 0) { if (modelName.size() > 0) {
throw new CustomException("该人员有参与工作流流程审批,请调整流程后再删除账号", HttpStatus.INTERNAL_SERVER_ERROR); throw new CustomException("该人员有参与工作流流程审批,请调整流程后再删除账号", HttpStatus.INTERNAL_SERVER_ERROR);
} }
}
String projectSn = MapUtils.getString(map, "projectSn"); String projectSn = MapUtils.getString(map, "projectSn");
SystemUser systemUser = getById(id); SystemUser systemUser = getById(id);
if (systemUser == null) { if (systemUser == null) {