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] =?UTF-8?q?fix:=20=E9=A1=B9=E7=9B=AE=E6=A8=A1=E5=9D=97=20?=
 =?UTF-8?q?=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<ProjectChildDO> projectChildDOList = projectMapper.getAllChildByProjectId(id);
 
         List<ReturnGetVO> 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<ProjectModuleDO> projectModuleDOList = projectMapper.getModuleByChildId(id);
+
         List<ReturnGetVO> returnGetVOList = new ArrayList<>();
+
+        if (projectModuleDOList.size() == 0) {
+            return ResultUtil.success(returnGetVOList);
+        }
+
         for (ProjectModuleDO projectModuleDO : projectModuleDOList) {
             ReturnGetVO returnGetVO = new ReturnGetVO();
             Processing.copyProperties(projectModuleDO, returnGetVO);