|
@@ -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);
|
|
|
}
|