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

Merge pull request 'bug:增加判空' (#47) from feature-zrx into develop

Browse Source 
Reviewed-on: #47
Reviewed-by: 筱锋xiao_lfeng <gm@x-lf.cn>
This commit is contained in:
筱锋xiao_lfeng 2024-04-30 10:03:54 +08:00
commit 84882fa59a
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/jsl/oa/model/vodata/ProjectDailyVO.java
View File

@ -28,13 +28,13 @@ public class ProjectDailyVO {
private String content; private String content;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date dailyTime; private Date dailyTime;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date createdAt; private Date createdAt;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date updatedAt; private Date updatedAt;
private Boolean isAllowDelete; private Boolean isAllowDelete;

11
src/main/java/com/jsl/oa/services/impl/ReviewServiceImpl.java
View File

@ -178,7 +178,7 @@ public class ReviewServiceImpl implements ReviewService {
//获取用户 //获取用户
Integer userId = Math.toIntExact(Processing.getAuthHeaderToUserId(request)); Integer userId = Math.toIntExact(Processing.getAuthHeaderToUserId(request));
//检查对应项目，子系统，子模块是否存在 //检查对应项目，子系统，子模块是否存在 用变量接收
if (projectMapper.getNotDeleteProjectById(Long.valueOf(reviewAddVO.getProjectId())) == null) { if (projectMapper.getNotDeleteProjectById(Long.valueOf(reviewAddVO.getProjectId())) == null) {
return ResultUtil.error(ErrorCode.PROJECT_NOT_EXIST); return ResultUtil.error(ErrorCode.PROJECT_NOT_EXIST);
} }
@ -266,10 +266,15 @@ public class ReviewServiceImpl implements ReviewService {
reviewDO.setRecipientId(userId); reviewDO.setRecipientId(userId);
reviewDO.setReviewResult(reviewUpdateResultVO.getResult()); reviewDO.setReviewResult(reviewUpdateResultVO.getResult());
Integer moduleId = null;
if (reviewDO.getProjectModuleId() != null) {
moduleId = Math.toIntExact(reviewDO.getProjectModuleId());
}
//发送消息 //发送消息
messageService.messageAdd(Math.toIntExact(reviewDO.getProjectId()), messageService.messageAdd(Math.toIntExact(reviewDO.getProjectId()),
Math.toIntExact(reviewDO.getProjectChildId()), Math.toIntExact(reviewDO.getProjectChildId()),
Math.toIntExact(reviewDO.getProjectModuleId()), moduleId,
Long.valueOf(reviewDO.getSenderId()), Long.valueOf(reviewDO.getSenderId()),
Long.valueOf(reviewUpdateResultVO.getResult()), Long.valueOf(reviewUpdateResultVO.getResult()),
request); request);
@ -398,7 +403,7 @@ public class ReviewServiceImpl implements ReviewService {
if (projectChildDO != null) { if (projectChildDO != null) {
reviewVO.setProjectChildName(projectChildDO.getName()); reviewVO.setProjectChildName(projectChildDO.getName());
} else { } else {
reviewVO.setProjectChildName(projectChildDO.getName()); reviewVO.setProjectChildName("未找到子系统");
} }
// 设置结果、发送者id，接受者id // 设置结果、发送者id，接受者id
reviewVO.setResult(Processing.turnReviewResult(reviewDO.getReviewResult())) reviewVO.setResult(Processing.turnReviewResult(reviewDO.getReviewResult()))