|
@@ -125,10 +125,6 @@ public class UserInfoManage { |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
private List<String> getCompliantOrgEmpCodeList(String orgName, String orgCode, Long regionId) { |
|
|
private List<String> getCompliantOrgEmpCodeList(String orgName, String orgCode, Long regionId) { |
|
|
if (Objects.nonNull(regionId) && regionId == 331100L) { |
|
|
|
|
|
// 丽水默认查全部 |
|
|
|
|
|
regionId = null; |
|
|
|
|
|
} |
|
|
|
|
|
if (StringUtils.isBlank(orgName) && StringUtils.isBlank(orgCode) && Objects.isNull(regionId)) { |
|
|
if (StringUtils.isBlank(orgName) && StringUtils.isBlank(orgCode) && Objects.isNull(regionId)) { |
|
|
return null; |
|
|
return null; |
|
|
} |
|
|
} |
|
@@ -434,7 +430,7 @@ public class UserInfoManage { |
|
|
userInfo.setUserName(u.getRealName()); |
|
|
userInfo.setUserName(u.getRealName()); |
|
|
// 根据 单位code获取单位名称 |
|
|
// 根据 单位code获取单位名称 |
|
|
UserFullInfoDTO userFullInfo = userInfoHelper.getUserFullInfo(u.getId()); |
|
|
UserFullInfoDTO userFullInfo = userInfoHelper.getUserFullInfo(u.getId()); |
|
|
if(Objects.nonNull(userFullInfo)){ |
|
|
|
|
|
|
|
|
if (Objects.nonNull(userFullInfo)) { |
|
|
userInfo.setOrgCode(userFullInfo.getEmpPosUnitCode()); |
|
|
userInfo.setOrgCode(userFullInfo.getEmpPosUnitCode()); |
|
|
userInfo.setOrgName(userFullInfo.getEmpPosUnitName()); |
|
|
userInfo.setOrgName(userFullInfo.getEmpPosUnitName()); |
|
|
} |
|
|
} |
|
@@ -443,12 +439,12 @@ public class UserInfoManage { |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
public Map<String, ProcessInstanceUserDto> getUserMapByEmployeeCode(Set<String> staterUsers) { |
|
|
public Map<String, ProcessInstanceUserDto> getUserMapByEmployeeCode(Set<String> staterUsers) { |
|
|
if(CollUtil.isEmpty(staterUsers)){ |
|
|
|
|
|
|
|
|
if (CollUtil.isEmpty(staterUsers)) { |
|
|
return Collections.emptyMap(); |
|
|
return Collections.emptyMap(); |
|
|
} |
|
|
} |
|
|
List<UserInfo> userInfos = iUserInfoService.list(Wrappers.lambdaQuery(UserInfo.class) |
|
|
List<UserInfo> userInfos = iUserInfoService.list(Wrappers.lambdaQuery(UserInfo.class) |
|
|
.in(UserInfo::getEmployeeCode,staterUsers)); |
|
|
|
|
|
if(CollUtil.isEmpty(userInfos)){ |
|
|
|
|
|
|
|
|
.in(UserInfo::getEmployeeCode, staterUsers)); |
|
|
|
|
|
if (CollUtil.isEmpty(userInfos)) { |
|
|
return Collections.emptyMap(); |
|
|
return Collections.emptyMap(); |
|
|
} |
|
|
} |
|
|
return userInfos.stream().map(u -> { |
|
|
return userInfos.stream().map(u -> { |
|
@@ -457,7 +453,7 @@ public class UserInfoManage { |
|
|
userInfo.setUserName(u.getRealName()); |
|
|
userInfo.setUserName(u.getRealName()); |
|
|
// 根据 单位code获取单位名称 |
|
|
// 根据 单位code获取单位名称 |
|
|
UserFullInfoDTO userFullInfo = userInfoHelper.getUserFullInfo(u.getId()); |
|
|
UserFullInfoDTO userFullInfo = userInfoHelper.getUserFullInfo(u.getId()); |
|
|
if(Objects.nonNull(userFullInfo)){ |
|
|
|
|
|
|
|
|
if (Objects.nonNull(userFullInfo)) { |
|
|
userInfo.setOrgCode(userFullInfo.getEmpPosUnitCode()); |
|
|
userInfo.setOrgCode(userFullInfo.getEmpPosUnitCode()); |
|
|
userInfo.setOrgName(userFullInfo.getEmpPosUnitName()); |
|
|
userInfo.setOrgName(userFullInfo.getEmpPosUnitName()); |
|
|
} |
|
|
} |
|
@@ -472,7 +468,7 @@ public class UserInfoManage { |
|
|
processInstanceUserDto.setUserName(userInfo.getRealName()); |
|
|
processInstanceUserDto.setUserName(userInfo.getRealName()); |
|
|
// 根据 单位code获取单位名称 |
|
|
// 根据 单位code获取单位名称 |
|
|
UserFullInfoDTO userFullInfo = userInfoHelper.getUserFullInfo(userInfo.getId()); |
|
|
UserFullInfoDTO userFullInfo = userInfoHelper.getUserFullInfo(userInfo.getId()); |
|
|
if(Objects.nonNull(userFullInfo)){ |
|
|
|
|
|
|
|
|
if (Objects.nonNull(userFullInfo)) { |
|
|
processInstanceUserDto.setOrgCode(userFullInfo.getEmpPosUnitCode()); |
|
|
processInstanceUserDto.setOrgCode(userFullInfo.getEmpPosUnitCode()); |
|
|
processInstanceUserDto.setOrgName(userFullInfo.getEmpPosUnitName()); |
|
|
processInstanceUserDto.setOrgName(userFullInfo.getEmpPosUnitName()); |
|
|
} |
|
|
} |
|
|