fix:审核模块与日报模块接口

增加非空判断

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,

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);
     }
 }

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, "未找到对应审核信息");