From 19b38290257205184c288dedd3af70bc68c095ba Mon Sep 17 00:00:00 2001
From: xiangZr-hhh <“2774915446@qq.com”>
Date: Fri, 19 Apr 2024 17:12:16 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E6=97=A5=E6=8A=A5=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

日报添加接口修正
---
 src/main/java/com/jsl/oa/config/startup/PermissionList.java | 4 ++--
 .../java/com/jsl/oa/controllers/ProjectDailyController.java | 6 ++++--
 .../com/jsl/oa/services/impl/ProjectDailyServiceImpl.java   | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/jsl/oa/config/startup/PermissionList.java b/src/main/java/com/jsl/oa/config/startup/PermissionList.java
index 52c4bdf..129caa6 100644
--- a/src/main/java/com/jsl/oa/config/startup/PermissionList.java
+++ b/src/main/java/com/jsl/oa/config/startup/PermissionList.java
@@ -34,15 +34,15 @@ public class PermissionList {
         permissionPrincipal.add(new PermissionVO("project:child:add", "增加子系统"));
         permissionPrincipal.add(new PermissionVO("project:module:add", "增加子模块"));
         permissionPrincipal.add(new PermissionVO("review:add", "添加审核申请"));
-        permissionPrincipal.add(new PermissionVO("project:daily:add", "添加日报"));
+        permissionPrincipal.add(new PermissionVO("daily:add", "添加日报"));
         permissionPrincipal.add(new PermissionVO("project:daily:delete", "删除日报"));
 
         permissionDeveloper.add(new PermissionVO("auth:change_password", "修改密码"));
         permissionDeveloper.add(new PermissionVO("info:get_header_image", "获取头部图片"));
         permissionDeveloper.add(new PermissionVO("info:edit_header_image", "编辑头部图片"));
         permissionDeveloper.add(new PermissionVO("info:delete_header_image", "删除头部图片"));
-        permissionDeveloper.add(new PermissionVO("project:daily:add", "添加日报"));
         permissionDeveloper.add(new PermissionVO("review:add", "添加审核申请"));
+        permissionDeveloper.add(new PermissionVO("daily:add", "添加日报"));
         permissionPrincipal.add(new PermissionVO("project:child:add", "增加子系统"));
         permissionPrincipal.add(new PermissionVO("project:module:add", "增加子模块"));
     }
diff --git a/src/main/java/com/jsl/oa/controllers/ProjectDailyController.java b/src/main/java/com/jsl/oa/controllers/ProjectDailyController.java
index 4b77b59..d6a2f93 100644
--- a/src/main/java/com/jsl/oa/controllers/ProjectDailyController.java
+++ b/src/main/java/com/jsl/oa/controllers/ProjectDailyController.java
@@ -43,8 +43,8 @@ public class ProjectDailyController {
      * @return 新增结果
      */
     @PostMapping("/daily/add")
-    @NeedPermission("project:daily:add")
-    public BaseResponse add(@RequestBody @Validated ProjectDailyAddVO projectDailyAddVO,
+    @NeedPermission("daily:add")
+    public BaseResponse addDaily(@RequestBody @Validated ProjectDailyAddVO projectDailyAddVO,
                             @NotNull BindingResult bindingResult,
                             HttpServletRequest request) {
         // 判断是否有参数错误
@@ -55,6 +55,7 @@ public class ProjectDailyController {
         return projectDailyService.addDaily(projectDailyAddVO, request);
     }
 
+
     @DeleteMapping("/daily/delete")
     @NeedPermission("project:daily:delete")
     public BaseResponse delete(@RequestParam Integer dailyId,
@@ -63,6 +64,7 @@ public class ProjectDailyController {
         return projectDailyService.deleteDaily(dailyId, request);
     }
 
+
     @GetMapping("/daily/getMyDaily")
     public BaseResponse getMyDaily(@RequestParam Integer page,
                                    @RequestParam Integer pageSize,
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 b627360..96ce19c 100644
--- a/src/main/java/com/jsl/oa/services/impl/ProjectDailyServiceImpl.java
+++ b/src/main/java/com/jsl/oa/services/impl/ProjectDailyServiceImpl.java
@@ -62,7 +62,7 @@ public class ProjectDailyServiceImpl implements ProjectDailyService {
         ProjectDailyDO projectDailyDO = new ProjectDailyDO();
         Processing.copyProperties(projectDailyAddVO, projectDailyDO);
         projectDailyDO.setUserId(userId);
-
+        projectDailyDO.setProjectId(Long.valueOf(projectDailyAddVO.getProjectId()));
 
 //        向数据库添加数据
         projectDailyDAO.addProjectDaily(projectDailyDO);