修复部分用户消息通知异常

service-pm/service-pm-biz/src/main/java/com/usky/pm/service/config/DingTalkAndMessage.java

@@ -123,14 +123,15 @@ public class DingTalkAndMessage {
         String userName = user.getUserName();
         LocalDateTime now = LocalDateTime.now();
 
-        dingTalkId = getDingTalkId(userId, mobile, dingTalkId);
+        // 先看用户是否存在配置
         MceMbuser mceMbuser = getMceMbuser(userId);
-
         if (mceMbuser != null) {
             String dingId = mceMbuser.getDingTalkId();
             if (StringUtils.isNotBlank(dingId)) {
                 return dingId;
             } else {
+                dingTalkId = getDingTalkId(userId, mobile, dingTalkId);
+
                 // 钉钉userid存入注册表
                 MceMbuser mbuser = new MceMbuser();
                 mbuser.setDingTalkId(dingTalkId);
@@ -141,6 +142,8 @@ public class DingTalkAndMessage {
                 mceMbuserMapper.updateById(mbuser);
             }
         } else {
+            dingTalkId = getDingTalkId(userId, mobile, dingTalkId);
+
             // 钉钉userid存入注册表
             MceMbuser mbuser = new MceMbuser();
             mbuser.setDingTalkId(dingTalkId);
@@ -325,7 +328,8 @@ public class DingTalkAndMessage {
         mceRequestVO.setInfoType(String.valueOf(INFO_TYPE));
         mceRequestVO.setId(newReport.getId());
         mceRequestVO.setInfoTypeName(INFO_TITLE);
-        mceRequestVO.setUserName(nickName.getNickName());
+        mceRequestVO.setUserName(username);
+
         if (!userId.isEmpty()) {
             mceRequestVO.setUserIds(userId);
         }

service-pm/service-pm-biz/src/main/java/com/usky/pm/service/impl/PmWorkReportServiceImpl.java

@@ -779,7 +779,7 @@ public class PmWorkReportServiceImpl extends AbstractCrudService<PmWorkReportMap
         mceRequestVO.setInfoType(String.valueOf(INFO_TYPE));
         mceRequestVO.setId(0);
         mceRequestVO.setInfoTypeName(INFO_TITLE);
-        mceRequestVO.setUserName("报告提醒通知");
+        mceRequestVO.setUserName("报告管理系统");
         if (!userIds.isEmpty()) {
             mceRequestVO.setUserIds(userIds);
         }