diff --git a/src/main/java/io/v/nutz/zhgh/msgNotify/MsgNotifyController.java b/src/main/java/io/v/nutz/zhgh/msgNotify/MsgNotifyController.java index 2ba622f..c8fd4db 100644 --- a/src/main/java/io/v/nutz/zhgh/msgNotify/MsgNotifyController.java +++ b/src/main/java/io/v/nutz/zhgh/msgNotify/MsgNotifyController.java @@ -172,14 +172,14 @@ public class MsgNotifyController { msgNotifyUser.setSendUser(ShiroUtil.getUserId()); msgNotifyUser.setTitle(msgNotify.getTitle()); msgNotifyUser.setContent(msgNotify.getContent()); - msgNotifyUser.setLink(msgNotify.getUrl()); + msgNotifyUser.setLink(msgNotify.getLink()); msgNotifyUser.setApiModule("消息管理系统"); if (msgNotify.getSendMode().equals("one")) { List list = msgNotifyService.getUserByRoleIds(msgNotify.getModule(), msgNotify.getTeacherMeetingId(), msgNotify.getRoleIds()); if (flag) { List loginNames = list.stream().map(v -> v.getString("loginName")).toList(); - msgNotifyService.sendMsg2(msgNotify.getSendTypes(), loginNames, msgNotify.getContent(),msgNotify.getTitle(),msgNotify.getUrl()); + msgNotifyService.sendMsg2(msgNotify.getSendTypes(), loginNames, msgNotify.getContent(),msgNotify.getTitle(),msgNotify.getLink()); } list.forEach(v -> { if (flag) { @@ -196,7 +196,7 @@ public class MsgNotifyController { List userScopes = msgNotifyService.getUserScopes(msgNotify.getActivityGroupId()); if (flag) { List loginNames = userScopes.stream().map(v -> v.getString("loginName")).toList(); - msgNotifyService.sendMsg2(msgNotify.getSendTypes(), loginNames, msgNotify.getContent(),msgNotify.getTitle(),msgNotify.getUrl()); + msgNotifyService.sendMsg2(msgNotify.getSendTypes(), loginNames, msgNotify.getContent(),msgNotify.getTitle(),msgNotify.getLink()); } userScopes.forEach(v -> { if (flag) { @@ -212,7 +212,7 @@ public class MsgNotifyController { if (flag) { List user = dao.query(User.class, Cnd.where("id", "in", users)); List loginNames = user.stream().map(User::getLoginname).toList(); - msgNotifyService.sendMsg2(msgNotify.getSendTypes(), loginNames, msgNotify.getContent(),msgNotify.getTitle(),msgNotify.getUrl()); + msgNotifyService.sendMsg2(msgNotify.getSendTypes(), loginNames, msgNotify.getContent(),msgNotify.getTitle(),msgNotify.getLink()); } for (String u : users) { if (flag) { @@ -229,7 +229,7 @@ public class MsgNotifyController { List loginNames = redisService.lrange(existsLoginNameRedisKey, 0, -1); List userList = dao.query(User.class, Cnd.where("loginname", "in", loginNames)); - msgNotifyService.sendMsg2(msgNotify.getSendTypes(), loginNames, msgNotify.getContent(),msgNotify.getTitle(),msgNotify.getUrl()); + msgNotifyService.sendMsg2(msgNotify.getSendTypes(), loginNames, msgNotify.getContent(),msgNotify.getTitle(),msgNotify.getLink()); msgNotify.setSendTime(DateUtil.getDateTime()); for (User u : userList) {