From 7f146cd2f5be30bfaeb1bb0af994d3801275b84d Mon Sep 17 00:00:00 2001 From: xiangZr-hhh <“2774915446@qq.com”> Date: Sat, 20 Apr 2024 15:19:17 +0800 Subject: [PATCH 1/7] =?UTF-8?q?patch=EF=BC=9A=E6=97=A5=E6=8A=A5=E6=A8=A1?= =?UTF-8?q?=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 查询接口添加负责人字段，优化获取用户名称 --- src/main/java/com/jsl/oa/dao/ProjectDAO.java | 19 +++++++++++++++++++ .../jsl/oa/model/vodata/ProjectDailyVO.java | 2 ++ .../impl/ProjectDailyServiceImpl.java | 13 +++++++++++-- 3 files changed, 32 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/jsl/oa/dao/ProjectDAO.java b/src/main/java/com/jsl/oa/dao/ProjectDAO.java index 1e7491e..7de194f 100644 --- a/src/main/java/com/jsl/oa/dao/ProjectDAO.java +++ b/src/main/java/com/jsl/oa/dao/ProjectDAO.java @@ -1,9 +1,11 @@ package com.jsl.oa.dao; import com.google.gson.Gson; import com.jsl.oa.mapper.ProjectMapper; +import com.jsl.oa.mapper.UserMapper; import com.jsl.oa.model.dodata.ProjectChildDO; import com.jsl.oa.model.dodata.ProjectDO; import com.jsl.oa.model.dodata.ProjectModuleDO; +import com.jsl.oa.model.dodata.UserDO; import com.jsl.oa.model.dodata.info.ProjectShowDO; import com.jsl.oa.model.vodata.ProjectInfoVO; import com.jsl.oa.model.vodata.ProjectChildAddVO; @@ -24,6 +26,7 @@ import java.util.Objects; public class ProjectDAO { private final ProjectMapper projectMapper; + private final UserMapper userMapper; private final Gson gson; public void projectAdd(ProjectInfoVO projectAdd) { @@ -205,4 +208,20 @@ public class ProjectDAO { } + public String getPrincipalUserFromProject(Long projectId) { + + if (projectId == null) { + return ""; + } + + ProjectDO projectDO = new ProjectDO(); + + UserDO userDO = userMapper.getUserById(projectDO.getPrincipalId()); + + if (userDO.getNickname() == null) { + return userDO.getUsername(); + } else { + return userDO.getNickname(); + } + } } diff --git a/src/main/java/com/jsl/oa/model/vodata/ProjectDailyVO.java b/src/main/java/com/jsl/oa/model/vodata/ProjectDailyVO.java index d2a1deb..ee16abb 100644 --- a/src/main/java/com/jsl/oa/model/vodata/ProjectDailyVO.java +++ b/src/main/java/com/jsl/oa/model/vodata/ProjectDailyVO.java @@ -21,6 +21,8 @@ public class ProjectDailyVO { private String projectName; + private String principalName; + private String content; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") diff --git a/src/main/java/com/jsl/oa/services/impl/ProjectDailyServiceImpl.java b/src/main/java/com/jsl/oa/services/impl/ProjectDailyServiceImpl.java index cd1d202..86ec3f8 100644 --- a/src/main/java/com/jsl/oa/services/impl/ProjectDailyServiceImpl.java +++ b/src/main/java/com/jsl/oa/services/impl/ProjectDailyServiceImpl.java @@ -8,6 +8,7 @@ import com.jsl.oa.dao.ProjectDailyDAO; import com.jsl.oa.dao.UserDAO; import com.jsl.oa.mapper.ProjectDailyMapper; import com.jsl.oa.model.dodata.ProjectDailyDO; +import com.jsl.oa.model.dodata.UserDO; import com.jsl.oa.model.vodata.ProjectDailyAddVO; import com.jsl.oa.model.vodata.ProjectDailyDataVO; import com.jsl.oa.model.vodata.ProjectDailyUpdateVO; @@ -205,8 +206,16 @@ public class ProjectDailyServiceImpl implements ProjectDailyService { Processing.copyProperties(projectDailyDO, projectDailyVO); // 赋值其他需查询的属性 projectDailyVO.setProjectName( - projectDAO.getProjectById(projectDailyVO.getProjectId()).getName()) - .setUserName(userDAO.getUserById(projectDailyDO.getUserId()).getNickname()); + projectDAO.getProjectById(projectDailyVO.getProjectId()).getName()); + //设置发送者名称，如果为昵称为空则赋值用户账号 + UserDO senderUser = userDAO.getUserById(projectDailyDO.getUserId()); + if (senderUser.getNickname() == null) { + projectDailyVO.setUserName(senderUser.getUsername()); + } else { + projectDailyVO.setUserName(senderUser.getNickname()); + } + //设置项目负责人名称 + projectDailyVO.setPrincipalName(projectDAO.getPrincipalUserFromProject(projectDailyDO.getProjectId())); //用户是否有权限删除 if (projectDailyDO.getUserId().equals(projectDAO. getProjectById(projectDailyVO.getProjectId()).getPrincipalId())) { From fa6b524b9869afe2656c10c66f9894251c710725 Mon Sep 17 00:00:00 2001 From: xiangZr-hhh <“2774915446@qq.com”> Date: Sat, 20 Apr 2024 15:30:53 +0800 Subject: [PATCH 2/7] =?UTF-8?q?fix:=20=E9=A1=B9=E7=9B=AE=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=20=E6=A0=B9=E6=8D=AEid=E8=8E=B7=E5=8F=96=E5=AF=B9=E5=BA=94?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E4=B8=8E=E5=AD=90=E7=B3=BB=E7=BB=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 增加非空判断 --- .../com/jsl/oa/controllers/ProjectController.java | 10 ++++++++++ .../com/jsl/oa/services/impl/MessageServiceImpl.java | 1 + .../com/jsl/oa/services/impl/ProjectServiceImpl.java | 12 ++++++++++++ 3 files changed, 23 insertions(+) diff --git a/src/main/java/com/jsl/oa/controllers/ProjectController.java b/src/main/java/com/jsl/oa/controllers/ProjectController.java index 2c98673..334895e 100755 --- a/src/main/java/com/jsl/oa/controllers/ProjectController.java +++ b/src/main/java/com/jsl/oa/controllers/ProjectController.java @@ -393,6 +393,11 @@ public class ProjectController { @RequestParam Integer id, HttpServletRequest request ) { + + if (id == null) { + return ResultUtil.error(ErrorCode.ID_NOT_EXIST); + } + return projectService.projectChildGetById(id, request); } @@ -419,6 +424,11 @@ public class ProjectController { @RequestParam Integer childId, HttpServletRequest request ) { + + if (childId == null) { + return ResultUtil.error(ErrorCode.ID_NOT_EXIST); + } + return projectService.projectModuleGetById(childId, request); } 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 41377ca..ef6f2dc 100644 --- a/src/main/java/com/jsl/oa/services/impl/MessageServiceImpl.java +++ b/src/main/java/com/jsl/oa/services/impl/MessageServiceImpl.java @@ -303,6 +303,7 @@ public class MessageServiceImpl implements MessageService { messageMapper.messageAdd(messageAddVO); } + /** * 添加提醒消息 * 系统/模块到期提醒 diff --git a/src/main/java/com/jsl/oa/services/impl/ProjectServiceImpl.java b/src/main/java/com/jsl/oa/services/impl/ProjectServiceImpl.java index 58f1cc6..3b4a3a3 100644 --- a/src/main/java/com/jsl/oa/services/impl/ProjectServiceImpl.java +++ b/src/main/java/com/jsl/oa/services/impl/ProjectServiceImpl.java @@ -285,6 +285,11 @@ public class ProjectServiceImpl implements ProjectService { List projectChildDOList = projectMapper.getAllChildByProjectId(id); List returnGetVOList = new ArrayList<>(); + + if (projectChildDOList.size() == 0) { + return ResultUtil.success(returnGetVOList); + } + for (ProjectChildDO projectChildDO : projectChildDOList) { ReturnGetVO returnGetVO = new ReturnGetVO(); Processing.copyProperties(projectChildDO, returnGetVO); @@ -308,8 +313,15 @@ public class ProjectServiceImpl implements ProjectService { @Override public BaseResponse projectModuleGetById(Integer id, HttpServletRequest request) { + List projectModuleDOList = projectMapper.getModuleByChildId(id); + List returnGetVOList = new ArrayList<>(); + + if (projectModuleDOList.size() == 0) { + return ResultUtil.success(returnGetVOList); + } + for (ProjectModuleDO projectModuleDO : projectModuleDOList) { ReturnGetVO returnGetVO = new ReturnGetVO(); Processing.copyProperties(projectModuleDO, returnGetVO); From 1d0bb448058aa23c6bc2794ac1f099eb12116ba3 Mon Sep 17 00:00:00 2001 From: xiangZr-hhh <“2774915446@qq.com”> Date: Sat, 20 Apr 2024 15:39:27 +0800 Subject: [PATCH 3/7] =?UTF-8?q?fix:=E5=AE=A1=E6=A0=B8=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E4=B8=8E=E6=97=A5=E6=8A=A5=E6=A8=A1=E5=9D=97=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 增加非空判断 --- .../controllers/ProjectDailyController.java | 19 +++++++++++++++- .../jsl/oa/controllers/ReviewController.java | 22 ++++++++++++++++--- src/main/java/com/jsl/oa/utils/ErrorCode.java | 1 + 3 files changed, 38 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/jsl/oa/controllers/ProjectDailyController.java b/src/main/java/com/jsl/oa/controllers/ProjectDailyController.java index e894968..426ec89 100644 --- a/src/main/java/com/jsl/oa/controllers/ProjectDailyController.java +++ b/src/main/java/com/jsl/oa/controllers/ProjectDailyController.java @@ -60,7 +60,6 @@ public class ProjectDailyController { @NotNull BindingResult bindingResult, HttpServletRequest request) { - log.info("请求接口[PUT]: /daily/update"); // 判断是否有参数错误 if (bindingResult.hasErrors()) { return ResultUtil.error(ErrorCode.PARAMETER_ERROR, Processing.getValidatedErrorList(bindingResult)); @@ -73,6 +72,11 @@ public class ProjectDailyController { @NeedPermission("project:daily_delete") public BaseResponse delete(@RequestParam Integer dailyId, HttpServletRequest request) { + + if (dailyId == null) { + return ResultUtil.error(ErrorCode.ID_NOT_EXIST); + } + return projectDailyService.deleteDaily(dailyId, request); } @@ -81,6 +85,11 @@ public class ProjectDailyController { public BaseResponse getMyDaily(@RequestParam Integer page, @RequestParam Integer pageSize, HttpServletRequest request) { + + if (page == null || pageSize == null) { + return ResultUtil.error(ErrorCode.PAGE_NUMBER_IS_NULL); + } + return projectDailyService.getMyDaily(page, pageSize, request); } @@ -93,6 +102,14 @@ public class ProjectDailyController { String endTime, HttpServletRequest request) { + if (page == null || pageSize == null) { + return ResultUtil.error(ErrorCode.PAGE_NUMBER_IS_NULL); + } + + if (projectId == null) { + return ResultUtil.error(ErrorCode.ID_NOT_EXIST); + } + return projectDailyService.searchMyDaily(projectId, page, pageSize, diff --git a/src/main/java/com/jsl/oa/controllers/ReviewController.java b/src/main/java/com/jsl/oa/controllers/ReviewController.java index 237cb1e..8c955db 100644 --- a/src/main/java/com/jsl/oa/controllers/ReviewController.java +++ b/src/main/java/com/jsl/oa/controllers/ReviewController.java @@ -41,7 +41,11 @@ public class ReviewController { @RequestParam Integer page, @RequestParam Integer pageSize, HttpServletRequest request) { - log.info("请求接口[GET]: /review/getMyReview"); + + if (page == null || pageSize == null) { + return ResultUtil.error(ErrorCode.PAGE_NUMBER_IS_NULL); + } + return reviewService.getUserReview(page, pageSize, request); } @@ -55,6 +59,11 @@ public class ReviewController { public BaseResponse getMyReview(@RequestParam Integer page, @RequestParam Integer pageSize, HttpServletRequest request) { + + if (page == null || pageSize == null) { + return ResultUtil.error(ErrorCode.PAGE_NUMBER_IS_NULL); + } + return reviewService.getUserPendingApprovalReview(page, pageSize, request); } @@ -70,7 +79,6 @@ public class ReviewController { @NotNull BindingResult bindingResult, HttpServletRequest request) { - if (bindingResult.hasErrors()) { return ResultUtil.error(ErrorCode.REQUEST_BODY_ERROR); } @@ -96,7 +104,11 @@ public class ReviewController { public BaseResponse searchReview(String content, HttpServletRequest request, @RequestParam Integer page, - @RequestParam Integer pageSize) { + @RequestParam Integer pageSize) { + + if (page == null || pageSize == null) { + return ResultUtil.error(ErrorCode.PAGE_NUMBER_IS_NULL); + } return reviewService.searchReview(content, request, page, pageSize); } @@ -108,6 +120,10 @@ public class ReviewController { @RequestParam Integer page, @RequestParam Integer pageSize) { + if (page == null || pageSize == null) { + return ResultUtil.error(ErrorCode.PAGE_NUMBER_IS_NULL); + } + return reviewService.searchReviewRecords(content, statue, request, page, pageSize); } } diff --git a/src/main/java/com/jsl/oa/utils/ErrorCode.java b/src/main/java/com/jsl/oa/utils/ErrorCode.java index cacb380..2a64d8e 100755 --- a/src/main/java/com/jsl/oa/utils/ErrorCode.java +++ b/src/main/java/com/jsl/oa/utils/ErrorCode.java @@ -58,6 +58,7 @@ public enum ErrorCode { PROJECT_DAILY_NOT_EXIST("ProjectDailyNotExist", 40023, "日志不存在"), NOT_PERMISSION_UPDATE_DAILY("NotPermissionUpdateDaily", 40024, "用户无权限修改日报"), User_NOT_PROJECT_PRINCIPAL("UserNotProjectPrincipal", 40023, "用户非项目负责人"), + PAGE_NUMBER_IS_NULL("PageNumberIsNull", 40024, "分页参数为空"), REVIEW_NOT_EXIST("ReviewNotExit", 40101, "未找到对应审核信息"); From dca7d3c277523d237f23b1027b6991ac89ed4965 Mon Sep 17 00:00:00 2001 From: 176yunxuan <362612387@qq.com~> Date: Sat, 20 Apr 2024 16:07:20 +0800 Subject: [PATCH 4/7] =?UTF-8?q?fix:=E5=AE=8C=E5=96=84=E4=B8=9A=E5=8A=A1?= =?UTF-8?q?=E5=8F=91=E9=80=81=E6=B6=88=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/jsl/oa/dao/ProjectDAO.java | 3 -- .../oa/services/impl/MessageServiceImpl.java | 5 +++- .../oa/services/impl/ProjectServiceImpl.java | 30 +++++++++++++++---- 3 files changed, 29 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/jsl/oa/dao/ProjectDAO.java b/src/main/java/com/jsl/oa/dao/ProjectDAO.java index 1e7491e..74e029c 100644 --- a/src/main/java/com/jsl/oa/dao/ProjectDAO.java +++ b/src/main/java/com/jsl/oa/dao/ProjectDAO.java @@ -182,9 +182,6 @@ public class ProjectDAO { return projectMapper.getAllProject(); } - public ProjectModuleDO getProjectWorkerById(Long id) { - return projectMapper.getProjectWorkById(id); - } public List getProjectByPrincipalUser(Long uid) { log.info("\t> 执行 DAO 层 ProjectDAO.getProjectFromUser 方法"); 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 41377ca..14e57e2 100644 --- a/src/main/java/com/jsl/oa/services/impl/MessageServiceImpl.java +++ b/src/main/java/com/jsl/oa/services/impl/MessageServiceImpl.java @@ -188,7 +188,10 @@ public class MessageServiceImpl implements MessageService { // 获取项目名,负责人名 String projectName = projectMapper.tgetProjectById(pId).getName(); String senderName = userDAO.getUserById(Processing.getAuthHeaderToUserId(request)).getUsername(); - String systemName = projectMapper.getWorkById(systemId).getName(); + String systemName = null; + if (systemId != null) { + systemName = projectMapper.getWorkById(systemId).getName(); + } // 添加消息 // 1:上传文档 2:修改状态 3:修改负责人 List uidList = projectMapper.getMemberByProjectId(pId); diff --git a/src/main/java/com/jsl/oa/services/impl/ProjectServiceImpl.java b/src/main/java/com/jsl/oa/services/impl/ProjectServiceImpl.java index 58f1cc6..e4ddbb9 100644 --- a/src/main/java/com/jsl/oa/services/impl/ProjectServiceImpl.java +++ b/src/main/java/com/jsl/oa/services/impl/ProjectServiceImpl.java @@ -327,6 +327,10 @@ public class ProjectServiceImpl implements ProjectService { projectMapper.getPirIdbyId(projectMapper.getModuleById(id.intValue()).getProjectChildId()))) { return ResultUtil.error(ErrorCode.NOT_PERMISSION); } else { + ProjectModuleDO projectModuleDO = projectMapper.getModuleById(id.intValue()); + if (projectModuleDO == null) { + return ResultUtil.error(ErrorCode.MODULE_NOT_EXIST); + } HashMap descriptionMap = new HashMap<>(); descriptionMap.put("description", projectModuleEditVO.getDescription()); projectModuleEditVO.setDescription(gson.toJson(descriptionMap)); @@ -334,7 +338,6 @@ public class ProjectServiceImpl implements ProjectService { projectMapper.projectModuleEdit(projectModuleEditVO); } - return ResultUtil.success("修改成功"); } @@ -344,8 +347,12 @@ public class ProjectServiceImpl implements ProjectService { if (!Objects.equals(Processing.getAuthHeaderToUserId(request), projectMapper.getPirIdbyId(id))) { return ResultUtil.error(ErrorCode.NOT_PERMISSION); } else { + ProjectChildDO projectChildDO = projectMapper.getProjectChildById(id.intValue()); + if (projectChildDO == null) { + return ResultUtil.error(ErrorCode.PROJECT_CHILD_NOT_EXIST); + } JsonObject jsonObject = gson - .fromJson(projectMapper.getProjectChildById(id.intValue()).getDescription(), JsonObject.class); + .fromJson(projectChildDO.getDescription(), JsonObject.class); //改动简介发送消息 if (!Objects.equals(projectChildAddVO.getDescription(), "") && !projectChildAddVO.getDescription() @@ -353,11 +360,20 @@ public class ProjectServiceImpl implements ProjectService { messageService.messageAdd(projectMapper.getProjectIdBySysId(id) .intValue(), id.intValue(), null, 2, request); } // 改动周期或工作量发送消息 - if (projectChildAddVO.getCycle() != null || projectChildAddVO.getWorkLoad() != null) { + if ((projectChildAddVO.getCycle() != null + && projectChildDO.getCycle().equals(projectChildAddVO.getCycle())) + || (projectChildAddVO.getWorkLoad() != null + && projectChildDO.getWorkLoad().equals(projectChildAddVO.getWorkLoad())) + ) { messageService.messageAdd(projectMapper.getProjectIdBySysId(id) .intValue(), id.intValue(), null, 3, request); + } //改动负责人发送消息 + if (projectChildAddVO.getPrincipalId() != null + && !Objects.equals(projectChildAddVO.getPrincipalId(), + projectChildDO.getPrincipalId())) { + messageService.messageAdd(projectMapper.getProjectIdBySysId(id) + .intValue(), 3, id.intValue(), request); } - HashMap descriptionMap = new HashMap<>(); descriptionMap.put("description", projectChildAddVO.getDescription()); projectChildAddVO.setDescription(gson.toJson(descriptionMap)); @@ -366,7 +382,6 @@ public class ProjectServiceImpl implements ProjectService { projectMapper.projectChildEditAll(projectChildAddVO); } - return ResultUtil.success("修改成功"); } @@ -428,6 +443,11 @@ public class ProjectServiceImpl implements ProjectService { //判断项目是否存在 if (projectDAO.isExistProject(projectId)) { //更新数据 + ProjectDO projectDO = projectDAO.getProjectById(projectId); + //改变项目状态发送消息 + if (projectEdit.getStatus() != null && !projectDO.getStatus().equals(projectEdit.getStatus())) { + messageService.messageAdd(projectId.intValue(), 2, null, request); + } HashMap descriptionMap = new HashMap<>(); descriptionMap.put("description", projectEdit.getDescription()); projectEdit.setDescription(gson.toJson(descriptionMap)); From ba4ed9fe5d9f468002751ee353318246e40b3430 Mon Sep 17 00:00:00 2001 From: xiangZr-hhh <“2774915446@qq.com”> Date: Sat, 20 Apr 2024 19:02:36 +0800 Subject: [PATCH 5/7] =?UTF-8?q?patch:=20=E4=BF=AE=E6=AD=A3=E6=97=A5?= =?UTF-8?q?=E6=8A=A5=E6=A8=A1=E5=9D=97=E5=88=A4=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 增加昵称字段给前端 --- src/main/java/com/jsl/oa/dao/ProjectDAO.java | 6 +++++- .../java/com/jsl/oa/model/vodata/ProjectDailyVO.java | 2 ++ .../jsl/oa/services/impl/ProjectDailyServiceImpl.java | 10 +++++++--- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/jsl/oa/dao/ProjectDAO.java b/src/main/java/com/jsl/oa/dao/ProjectDAO.java index 7de194f..31448eb 100644 --- a/src/main/java/com/jsl/oa/dao/ProjectDAO.java +++ b/src/main/java/com/jsl/oa/dao/ProjectDAO.java @@ -214,10 +214,14 @@ public class ProjectDAO { return ""; } - ProjectDO projectDO = new ProjectDO(); + ProjectDO projectDO = projectMapper.getProjectById(projectId); UserDO userDO = userMapper.getUserById(projectDO.getPrincipalId()); + if (userDO == null) { + return ""; + } + if (userDO.getNickname() == null) { return userDO.getUsername(); } else { diff --git a/src/main/java/com/jsl/oa/model/vodata/ProjectDailyVO.java b/src/main/java/com/jsl/oa/model/vodata/ProjectDailyVO.java index ee16abb..971cb12 100644 --- a/src/main/java/com/jsl/oa/model/vodata/ProjectDailyVO.java +++ b/src/main/java/com/jsl/oa/model/vodata/ProjectDailyVO.java @@ -17,6 +17,8 @@ public class ProjectDailyVO { private String userName; + private String nickName; + private Long projectId; private String projectName; diff --git a/src/main/java/com/jsl/oa/services/impl/ProjectDailyServiceImpl.java b/src/main/java/com/jsl/oa/services/impl/ProjectDailyServiceImpl.java index 86ec3f8..ffa5972 100644 --- a/src/main/java/com/jsl/oa/services/impl/ProjectDailyServiceImpl.java +++ b/src/main/java/com/jsl/oa/services/impl/ProjectDailyServiceImpl.java @@ -209,11 +209,15 @@ public class ProjectDailyServiceImpl implements ProjectDailyService { projectDAO.getProjectById(projectDailyVO.getProjectId()).getName()); //设置发送者名称，如果为昵称为空则赋值用户账号 UserDO senderUser = userDAO.getUserById(projectDailyDO.getUserId()); - if (senderUser.getNickname() == null) { - projectDailyVO.setUserName(senderUser.getUsername()); + + if (senderUser == null) { + projectDailyVO.setUserName(""); + projectDailyVO.setNickName(""); } else { - projectDailyVO.setUserName(senderUser.getNickname()); + projectDailyVO.setUserName(senderUser.getUsername()); + projectDailyVO.setNickName(senderUser.getNickname()); } + //设置项目负责人名称 projectDailyVO.setPrincipalName(projectDAO.getPrincipalUserFromProject(projectDailyDO.getProjectId())); //用户是否有权限删除 From abef74af38e48293faa518c11aafa57650240b2e Mon Sep 17 00:00:00 2001 From: 176yunxuan <362612387@qq.com~> Date: Sat, 20 Apr 2024 19:53:21 +0800 Subject: [PATCH 6/7] =?UTF-8?q?fix:=E5=AE=8C=E5=96=84=E4=B8=9A=E5=8A=A1?= =?UTF-8?q?=E5=8F=91=E9=80=81=E6=B6=88=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/jsl/oa/services/impl/MessageServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 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 14e57e2..5839cbb 100644 --- a/src/main/java/com/jsl/oa/services/impl/MessageServiceImpl.java +++ b/src/main/java/com/jsl/oa/services/impl/MessageServiceImpl.java @@ -189,7 +189,7 @@ public class MessageServiceImpl implements MessageService { String projectName = projectMapper.tgetProjectById(pId).getName(); String senderName = userDAO.getUserById(Processing.getAuthHeaderToUserId(request)).getUsername(); String systemName = null; - if (systemId != null) { + if (systemId != null && projectMapper.getWorkById(systemId) != null) { systemName = projectMapper.getWorkById(systemId).getName(); } // 添加消息 @@ -241,7 +241,7 @@ public class MessageServiceImpl implements MessageService { String senderName = userDAO.getUserById(Processing.getAuthHeaderToUserId(request)).getUsername(); String systemName = projectMapper.getWorkById(systmeId).getName(); String moddleName = null; - if (moddleId != null) { + if (moddleId != null && projectMapper.getModuleById(moddleId) != null) { moddleName = projectMapper.getModuleById(moddleId).getName(); } // 添加消息 From b79148cd8020110a802698ad8fb777c9865a7923 Mon Sep 17 00:00:00 2001 From: xiangZr-hhh <“2774915446@qq.com”> Date: Sat, 20 Apr 2024 19:53:40 +0800 Subject: [PATCH 7/7] =?UTF-8?q?fix:=20=E7=9B=AE=E6=A0=87=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E6=89=80=E6=9C=89=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 修正8小时时差问题 --- src/main/java/com/jsl/oa/model/vodata/ProjectDailyVO.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/main/java/com/jsl/oa/model/vodata/ProjectDailyVO.java b/src/main/java/com/jsl/oa/model/vodata/ProjectDailyVO.java index 971cb12..bf40db0 100644 --- a/src/main/java/com/jsl/oa/model/vodata/ProjectDailyVO.java +++ b/src/main/java/com/jsl/oa/model/vodata/ProjectDailyVO.java @@ -1,6 +1,5 @@ package com.jsl.oa.model.vodata; -import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import lombok.experimental.Accessors; @@ -27,13 +26,10 @@ public class ProjectDailyVO { private String content; - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date dailyTime; - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date createdAt; - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date updatedAt; private Boolean isAllowDelete;