modify: 用户查询改为全局查询，防止查不到用户名

yanxuan-qc-change-system-biz/src/main/java/com/netease/mail/yanxuan/change/biz/biz/ChangeFlowBiz.java

@@ -303,8 +303,8 @@ public class ChangeFlowBiz {
             param.put("changeSubject", ChangeSubjectEnum.getChangeSubjectEnum(changeRecord.getChangeSubject()).getDesc());
             param.put("changeContent", changeRecord.getChangeContent());
             param.put("changeReason", changeRecord.getChangeReason());
-            AjaxResponse<IusUserInfoRsp> user = iusRpcService.queryUserInfo(changeRecord.getChangeCommander());
-            param.put("changeCommander", user.getData().getName());
+            IusUserInfoRsp user = iusService.queryUserInfo(changeRecord.getChangeCommander());
+            param.put("changeCommander", user == null ? changeRecord.getChangeCommander() : user.getName());
             param.put("changeCommanderEmail", changeRecord.getChangeCommander());
             param.put("flowUrl", changeRecord.getFlowId());
             List<ChangeExecuteEmailDTO> dataList = new ArrayList<>();
@@ -621,8 +621,8 @@ public class ChangeFlowBiz {
                 param.put("changeSubject", ChangeSubjectEnum.getChangeSubjectEnum(changeRecord.getChangeSubject()).getDesc());
                 param.put("changeContent", changeRecord.getChangeContent());
                 param.put("changeReason", changeRecord.getChangeReason());
-                AjaxResponse<IusUserInfoRsp> user = iusRpcService.queryUserInfo(changeRecord.getChangeCommander());
-                param.put("changeCommander", user.getData().getName());
+                IusUserInfoRsp user = iusService.queryUserInfo(changeRecord.getChangeCommander());
+                param.put("changeCommander", user == null ? changeRecord.getChangeCommander() : user.getName());
                 param.put("changeCommanderEmail", changeRecord.getChangeCommander());
                 param.put("flowUrl", changeRecord.getFlowId());
                 param.put("dataList", changeExecRecords);
@@ -891,8 +891,8 @@ public class ChangeFlowBiz {
         cancelMap.put("changeId", changeRecord.getFlowId());
         cancelMap.put("changeSubject", ChangeSubjectEnum.getChangeSubjectEnum(changeRecord.getChangeSubject()).getDesc());
         cancelMap.put("changeContent", changeRecord.getChangeContent());
-        AjaxResponse<IusUserInfoRsp> user = iusRpcService.queryUserInfo(changeRecord.getChangeCommander());
-        cancelMap.put("changeCommander", user.getData().getName());
+        IusUserInfoRsp user = iusService.queryUserInfo(changeRecord.getChangeCommander());
+        cancelMap.put("changeCommander", user == null ? changeRecord.getChangeCommander() : user.getName());
         cancelMap.put("cancelReason", changeRecord.getCancelReason());
         String cancelSubjectParam = changeRecord.getFlowId().toString();
         List<String> receiver = new ArrayList<>(Collections.singletonList(changeCommander));
@@ -1260,8 +1260,10 @@ public class ChangeFlowBiz {
         String changeCommander = changeRecord.getChangeCommander();
         UserReachDTO userReachDTO = new UserReachDTO();
         // 查询邮箱对应的名字
-        AjaxResponse<IusUserInfoRsp> user = iusRpcService.queryUserInfo(changeRecord.getChangeCommander());
-        userReachDTO.setUserName(user.getData().getName());
+        IusUserInfoRsp user = iusService.queryUserInfo(changeRecord.getChangeCommander());
+        // 流程拓扑图，如果没查询到名字，以邮箱兜底
+        userReachDTO.setUserName(
+            user == null || StringUtils.isBlank(user.getName()) ? changeRecord.getChangeCommander() : user.getName());
         userReachDTO.setUid(changeCommander);
         List<UserReachDTO> totalUserList = Collections.singletonList(userReachDTO);
         UserBaseContainerDTO userBaseContainer = new UserBaseContainerDTO();
@@ -1361,12 +1363,12 @@ public class ChangeFlowBiz {
         deliverMap.put("changeSubject", ChangeSubjectEnum.getChangeSubjectEnum(changeRecord.getChangeSubject()).getDesc());
         deliverMap.put("changeContent", changeRecord.getChangeContent());
         // 转交人名称
-        AjaxResponse<IusUserInfoRsp> oldUser = iusRpcService.queryUserInfo(changeCommander);
-        deliverMap.put("changeCommander", oldUser.getData().getName());
+        IusUserInfoRsp oldUser = iusService.queryUserInfo(changeCommander);
+        deliverMap.put("changeCommander", oldUser == null ? changeCommander : oldUser.getName());
         deliverMap.put("changeCommanderEmail", changeCommander);
         // 被转交人名称
-        AjaxResponse<IusUserInfoRsp> newUser = iusRpcService.queryUserInfo(deliverUser);
-        deliverMap.put("restsChangeCommander", newUser.getData().getName());
+        IusUserInfoRsp newUser = iusService.queryUserInfo(deliverUser);
+        deliverMap.put("restsChangeCommander", newUser == null ? deliverUser : newUser.getName());
         deliverMap.put("restsChangeCommanderEmail", deliverUser);
         String deliverSubjectParam = changeRecord.getFlowId().toString();
         // 转交，收件人：变更转交人（工单接收人）、变更负责人（工单转交人）

yanxuan-qc-change-system-biz/src/main/java/com/netease/mail/yanxuan/change/biz/service/rpc/IusService.java

@@ -65,4 +65,20 @@ public class IusService {
             return new ArrayList<>();
         }
     }
+
+    /**
+     * 根据邮箱查询单个用户信息
+     */
+    public IusUserInfoRsp queryUserInfo(String uid) {
+        log.info("[queryUserInfo] queryUserInfo req:{}", uid);
+        // icac==true未全局查询，需保证必须查到用户名
+        AjaxResponse<IusUserInfoRsp> response = iusRpcService.queryUserInfo(uid, true);
+        log.info("[queryUserInfo] response of queryUserInfo ={}", JSON.toJSONString(response));
+        if (ResponseCodeEnum.SUCCESS.getCode() == response.getCode()) {
+            return response.getData();
+        } else {
+            log.error("[queryUserInfo] queryUserInfo failed, query={}, errMsg={}", uid, JSON.toJSONString(response));
+            return null;
+        }
+    }
 }
\ No newline at end of file

yanxuan-qc-change-system-integration/src/main/java/com/netease/mail/yanxuan/change/integration/flow/ius/IusRpcService.java

@@ -30,7 +30,8 @@ public interface IusRpcService {
      * @return
      */
     @GetMapping("/v1/qc/user/get")
-    AjaxResponse<IusUserInfoRsp> queryUserInfo(@RequestParam(name = "uid")String uid);
+    AjaxResponse<IusUserInfoRsp> queryUserInfo(@RequestParam(name = "uid") String uid,
+        @RequestParam(name = "icac") Boolean icac);
 
     /**
      * 获取指定用户信息，是否返回操作记录、关联的角色信息。当uid和userId都传时，需保证指向同一个用户。