Commit 8599c35c by “zcwang”

modify: 行动人批量查询未查到人名,再次通过全量查询人名

parent b5d144cf
...@@ -1082,6 +1082,12 @@ public class ChangeFlowBiz { ...@@ -1082,6 +1082,12 @@ public class ChangeFlowBiz {
Optional<IusUserInfoRsp> anyExeUser = data.stream().filter(u -> u.getUid().equals(i.getChangeExecUserEmail())).findAny(); Optional<IusUserInfoRsp> anyExeUser = data.stream().filter(u -> u.getUid().equals(i.getChangeExecUserEmail())).findAny();
if (anyExeUser.isPresent()) { if (anyExeUser.isPresent()) {
i.setChangeExecUserName(anyExeUser.get().getName()); i.setChangeExecUserName(anyExeUser.get().getName());
} else {
// 批量查询没查到的人名,通过全量查询单独再查一次
IusUserInfoRsp user = iusService.queryUserInfo(i.getChangeExecUserEmail());
if (user != null && StringUtils.isNotBlank(user.getName())) {
i.setChangeExecUserName(user.getName());
}
} }
}); });
...@@ -1100,6 +1106,7 @@ public class ChangeFlowBiz { ...@@ -1100,6 +1106,7 @@ public class ChangeFlowBiz {
commanderList.add(changeRecord.getCreator()); commanderList.add(changeRecord.getCreator());
IusDepartmentReq iusDepartmentReq = new IusDepartmentReq(); IusDepartmentReq iusDepartmentReq = new IusDepartmentReq();
iusDepartmentReq.setUids(new ArrayList<>(commanderList)); iusDepartmentReq.setUids(new ArrayList<>(commanderList));
iusDepartmentReq.setIcac(true);
HashMap<String, List<SecondaryDepartments>> orgMap = iusService.queryDepartment(iusDepartmentReq); HashMap<String, List<SecondaryDepartments>> orgMap = iusService.queryDepartment(iusDepartmentReq);
List<SecondaryDepartments> commander = orgMap.get(changeRecord.getChangeCommander()); List<SecondaryDepartments> commander = orgMap.get(changeRecord.getChangeCommander());
List<SecondaryDepartments> creator = orgMap.get(changeRecord.getCreator()); List<SecondaryDepartments> creator = orgMap.get(changeRecord.getCreator());
...@@ -1184,6 +1191,7 @@ public class ChangeFlowBiz { ...@@ -1184,6 +1191,7 @@ public class ChangeFlowBiz {
commanderList.addAll(creatorList); commanderList.addAll(creatorList);
IusDepartmentReq iusDepartmentReq = new IusDepartmentReq(); IusDepartmentReq iusDepartmentReq = new IusDepartmentReq();
iusDepartmentReq.setUids(new ArrayList<>(commanderList)); iusDepartmentReq.setUids(new ArrayList<>(commanderList));
iusDepartmentReq.setIcac(true);
HashMap<String, List<SecondaryDepartments>> orgMap = iusService.queryDepartment(iusDepartmentReq); HashMap<String, List<SecondaryDepartments>> orgMap = iusService.queryDepartment(iusDepartmentReq);
//AjaxResponse<List<IusUserInfoRsp>> userListInfo = iusRpcService.queryUserListInfo(UserQueryDTO.builder().uids(new ArrayList<>(commanderList)).build()); //AjaxResponse<List<IusUserInfoRsp>> userListInfo = iusRpcService.queryUserListInfo(UserQueryDTO.builder().uids(new ArrayList<>(commanderList)).build());
log.debug("query user: {} info: {}", commanderList, JSON.toJSONString(orgMap)); log.debug("query user: {} info: {}", commanderList, JSON.toJSONString(orgMap));
......
...@@ -46,8 +46,8 @@ public interface IusRpcService { ...@@ -46,8 +46,8 @@ public interface IusRpcService {
* @param uid * @param uid
* @return * @return
*/ */
@GetMapping("/v1/qc/allTeam/pos/queryLeaderChain") /*@GetMapping("/v1/qc/allTeam/pos/queryLeaderChain")
AjaxResponse<List<OrgPosLeaderChainRsp>> queryLeaderChain(@RequestParam(name = "uid")String uid); AjaxResponse<List<OrgPosLeaderChainRsp>> queryLeaderChain(@RequestParam(name = "uid")String uid);*/
/** /**
* 查询用户的负责人链(直接上级和所有上级),返回(key=用户邮箱,value=用户所属所有部门的上级(包括本部门)负责人链) * 查询用户的负责人链(直接上级和所有上级),返回(key=用户邮箱,value=用户所属所有部门的上级(包括本部门)负责人链)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment