WxxyDeveloper/JSL_OrganizeInternalOA
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:增加判空
All checks were successful
代码检查 / 代码检查 (pull_request) Successful in 18s
Details

Browse Source
This commit is contained in:
176yunxuan 2024-04-20 12:33:17 +08:00
parent 9639d21c0e
commit da387c04be
1 changed files with 39 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
src/main/java/com/jsl/oa/services/impl/MessageServiceImpl.java
View File

@ -192,30 +192,31 @@ public class MessageServiceImpl implements MessageService {
// 添加消息 // 添加消息
// 1:上传文档 2:修改状态 3:修改负责人 // 1:上传文档 2:修改状态 3:修改负责人
List<Long> uidList = projectMapper.getMemberByProjectId(pId); List<Long> uidList = projectMapper.getMemberByProjectId(pId);
for (Long uid : uidList) { if (!uidList.isEmpty()) {
if (uid != null) { for (Long uid : uidList) {
MessageAddVO messageAddVO = new MessageAddVO(); if (uid != null) {
messageAddVO.setUid(uid); MessageAddVO messageAddVO = new MessageAddVO();
messageAddVO.setSid(Processing.getAuthHeaderToUserId(request)); messageAddVO.setUid(uid);
messageAddVO.setTitle("项目变动消息"); messageAddVO.setSid(Processing.getAuthHeaderToUserId(request));
if (type == 3) { messageAddVO.setTitle("项目变动消息");
messageAddVO.setText("项目负责人" + senderName + "调整了" + systemName + "子系统的负责人"); if (type == 3) {
messageAddVO.setType("Project_child"); messageAddVO.setText("项目负责人" + senderName + "调整了" + systemName + "子系统的负责人");
messageAddVO.setToId(systemId.longValue()); messageAddVO.setType("Project_child");
} else if (type == 2) { messageAddVO.setToId(systemId.longValue());
messageAddVO.setText("项目负责人" + senderName + "修改了" + projectName + "项目的状态"); } else if (type == 2) {
messageAddVO.setType("Project"); messageAddVO.setText("项目负责人" + senderName + "修改了" + projectName + "项目的状态");
messageAddVO.setToId(pId.longValue()); messageAddVO.setType("Project");
} else if (type == 1) { messageAddVO.setToId(pId.longValue());
messageAddVO.setText("项目负责人" + senderName + "上传了文档到" + projectName + "项目"); } else if (type == 1) {
messageAddVO.setType("Project"); messageAddVO.setText("项目负责人" + senderName + "上传了文档到" + projectName + "项目");
messageAddVO.setToId(pId.longValue()); 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); messageMapper.messageAdd(messageAddVO);
} else { } else {
List<Long> uidList = projectMapper.getMemberBySystemId(systmeId); List<Long> uidList = projectMapper.getMemberBySystemId(systmeId);
for (Long uid : uidList) { if (!uidList.isEmpty()) {
if (uid != null) { for (Long uid : uidList) {
MessageAddVO messageAddVO = new MessageAddVO(); if (uid != null) {
messageAddVO.setUid(uid); MessageAddVO messageAddVO = new MessageAddVO();
messageAddVO.setSid(Processing.getAuthHeaderToUserId(request)); messageAddVO.setUid(uid);
messageAddVO.setTitle("子系统变动消息"); messageAddVO.setSid(Processing.getAuthHeaderToUserId(request));
if (type == 2) { messageAddVO.setTitle("子系统变动消息");
messageAddVO.setText("项目经理" + senderName + "修改了" + projectName + "项目的" if (type == 2) {
+ systemName + "系统的简介说明"); messageAddVO.setText("项目经理" + senderName + "修改了" + projectName + "项目的"
} else if (type == 3) { + systemName + "系统的简介说明");
messageAddVO.setText("项目经理" + senderName + "修改了" + projectName + "项目的" } else if (type == 3) {
+ systemName + "系统的系统周期/工作量"); messageAddVO.setText("项目经理" + senderName + "修改了" + projectName + "项目的"
} + systemName + "系统的系统周期/工作量");
messageAddVO.setType("Project_child"); }
messageAddVO.setToId(systmeId.longValue()); messageAddVO.setType("Project_child");
messageMapper.messageAdd(messageAddVO); messageAddVO.setToId(systmeId.longValue());
messageMapper.messageAdd(messageAddVO);
}
} }
} }
} }