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

条件分支修复

Browse Source
This commit is contained in:
pengjie 2024-05-01 18:57:43 +08:00
parent e28b59f591
commit 5abe733e96
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/FlowOrgRepositoryServiceImpl.java
View File

@ -185,7 +185,8 @@ public class FlowOrgRepositoryServiceImpl implements OrgRepositoryService {
public List<DeptDo> getSysAllDepts() { public List<DeptDo> getSysAllDepts() {
try { try {
return xzProjectOrgMapper.selectList(null).stream() return xzProjectOrgMapper.selectList(null).stream()
.map(d -> new DeptDo(d.getId().toString(), d.getDeptName(), "", d.getParentId().toString())) .map(d -> new DeptDo(d.getId().toString(), d.getDeptName(), d.getLeader() == null ?
null : d.getLeader().toString(), d.getParentId().toString()))
.collect(Collectors.toList()); .collect(Collectors.toList());
} catch (Exception e) { } catch (Exception e) {
return Collections.emptyList(); return Collections.emptyList();
@ -196,7 +197,7 @@ public class FlowOrgRepositoryServiceImpl implements OrgRepositoryService {
public List<UserDeptDo> getSysAllUserDepts() { public List<UserDeptDo> getSysAllUserDepts() {
try { try {
return systemUserMapper.selectList(null).stream() return systemUserMapper.selectList(null).stream()
.map(d -> new UserDeptDo(d.getUserId().toString(), d.getDepartment())) .map(d -> new UserDeptDo(d.getUserId().toString(), d.getXzProjectOrgId() == null ? null : d.getXzProjectOrgId().toString()))
.collect(Collectors.toList()); .collect(Collectors.toList());
} catch (Exception e) { } catch (Exception e) {
return Collections.emptyList(); return Collections.emptyList();

BIN
src/main/resources/lib/wflow-server-1.0-SNAPSHOT.jar
View File

Binary file not shown.