This commit is contained in:
2026-03-03 11:55:10 +08:00
parent 61217fd463
commit 04709fd43d
@@ -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<NutMap> list = msgNotifyService.getUserByRoleIds(msgNotify.getModule(), msgNotify.getTeacherMeetingId(), msgNotify.getRoleIds());
if (flag) {
List<String> 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<NutMap> userScopes = msgNotifyService.getUserScopes(msgNotify.getActivityGroupId());
if (flag) {
List<String> 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> user = dao.query(User.class, Cnd.where("id", "in", users));
List<String> 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<String> loginNames = redisService.lrange(existsLoginNameRedisKey, 0, -1);
List<User> 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) {