From da387c04be8429da7d245eaceaf8217d847dc536 Mon Sep 17 00:00:00 2001 From: 176yunxuan <362612387@qq.com~> Date: Sat, 20 Apr 2024 12:33:17 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E5=A2=9E=E5=8A=A0=E5=88=A4=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../oa/services/impl/MessageServiceImpl.java | 75 ++++++++++--------- 1 file changed, 39 insertions(+), 36 deletions(-) diff --git a/src/main/java/com/jsl/oa/services/impl/MessageServiceImpl.java b/src/main/java/com/jsl/oa/services/impl/MessageServiceImpl.java index 42d2eca..41377ca 100644 --- a/src/main/java/com/jsl/oa/services/impl/MessageServiceImpl.java +++ b/src/main/java/com/jsl/oa/services/impl/MessageServiceImpl.java @@ -192,30 +192,31 @@ public class MessageServiceImpl implements MessageService { // 添加消息 // 1:上传文档 2:修改状态 3:修改负责人 List uidList = projectMapper.getMemberByProjectId(pId); - for (Long uid : uidList) { - if (uid != null) { - MessageAddVO messageAddVO = new MessageAddVO(); - messageAddVO.setUid(uid); - messageAddVO.setSid(Processing.getAuthHeaderToUserId(request)); - messageAddVO.setTitle("项目变动消息"); - if (type == 3) { - messageAddVO.setText("项目负责人" + senderName + "调整了" + systemName + "子系统的负责人"); - messageAddVO.setType("Project_child"); - messageAddVO.setToId(systemId.longValue()); - } else if (type == 2) { - messageAddVO.setText("项目负责人" + senderName + "修改了" + projectName + "项目的状态"); - messageAddVO.setType("Project"); - messageAddVO.setToId(pId.longValue()); - } else if (type == 1) { - messageAddVO.setText("项目负责人" + senderName + "上传了文档到" + projectName + "项目"); - messageAddVO.setType("Project"); - messageAddVO.setToId(pId.longValue()); + if (!uidList.isEmpty()) { + for (Long uid : uidList) { + if (uid != null) { + MessageAddVO messageAddVO = new MessageAddVO(); + messageAddVO.setUid(uid); + messageAddVO.setSid(Processing.getAuthHeaderToUserId(request)); + messageAddVO.setTitle("项目变动消息"); + if (type == 3) { + messageAddVO.setText("项目负责人" + senderName + "调整了" + systemName + "子系统的负责人"); + messageAddVO.setType("Project_child"); + messageAddVO.setToId(systemId.longValue()); + } else if (type == 2) { + messageAddVO.setText("项目负责人" + senderName + "修改了" + projectName + "项目的状态"); + messageAddVO.setType("Project"); + messageAddVO.setToId(pId.longValue()); + } else if (type == 1) { + messageAddVO.setText("项目负责人" + senderName + "上传了文档到" + projectName + "项目"); + messageAddVO.setType("Project"); + messageAddVO.setToId(pId.longValue()); + } + messageMapper.messageAdd(messageAddVO); } - messageMapper.messageAdd(messageAddVO); } } } - /** * 添加子系统变动消息 * @@ -252,22 +253,24 @@ public class MessageServiceImpl implements MessageService { messageMapper.messageAdd(messageAddVO); } else { List uidList = projectMapper.getMemberBySystemId(systmeId); - for (Long uid : uidList) { - if (uid != null) { - MessageAddVO messageAddVO = new MessageAddVO(); - messageAddVO.setUid(uid); - messageAddVO.setSid(Processing.getAuthHeaderToUserId(request)); - messageAddVO.setTitle("子系统变动消息"); - if (type == 2) { - messageAddVO.setText("项目经理" + senderName + "修改了" + projectName + "项目的" - + systemName + "系统的简介说明"); - } else if (type == 3) { - messageAddVO.setText("项目经理" + senderName + "修改了" + projectName + "项目的" - + systemName + "系统的系统周期/工作量"); - } - messageAddVO.setType("Project_child"); - messageAddVO.setToId(systmeId.longValue()); - messageMapper.messageAdd(messageAddVO); + if (!uidList.isEmpty()) { + for (Long uid : uidList) { + if (uid != null) { + MessageAddVO messageAddVO = new MessageAddVO(); + messageAddVO.setUid(uid); + messageAddVO.setSid(Processing.getAuthHeaderToUserId(request)); + messageAddVO.setTitle("子系统变动消息"); + if (type == 2) { + messageAddVO.setText("项目经理" + senderName + "修改了" + projectName + "项目的" + + systemName + "系统的简介说明"); + } else if (type == 3) { + messageAddVO.setText("项目经理" + senderName + "修改了" + projectName + "项目的" + + systemName + "系统的系统周期/工作量"); + } + messageAddVO.setType("Project_child"); + messageAddVO.setToId(systmeId.longValue()); + messageMapper.messageAdd(messageAddVO); + } } } }