From 2a0e9e6f92c5f25a53aefa4edb708f42472e8a6e Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期一, 06 五月 2024 16:32:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/meeting/meeting_admin/src/main/java/com/doumee/api/cloud/CloudProjectsController.java | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/server/meeting/meeting_admin/src/main/java/com/doumee/api/cloud/CloudProjectsController.java b/server/meeting/meeting_admin/src/main/java/com/doumee/api/cloud/CloudProjectsController.java
index 2c1fa9d..2690bc9 100644
--- a/server/meeting/meeting_admin/src/main/java/com/doumee/api/cloud/CloudProjectsController.java
+++ b/server/meeting/meeting_admin/src/main/java/com/doumee/api/cloud/CloudProjectsController.java
@@ -7,6 +7,7 @@
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
+import com.doumee.core.utils.Constants;
import com.doumee.dao.business.model.Projects;
import com.doumee.dao.web.response.ProjectsResponse;
import com.doumee.service.business.ProjectsService;
@@ -35,9 +36,9 @@
@ApiOperation("鏂板缓")
@PostMapping("/create")
@CloudRequiredPermission("business:projects:create")
- public ApiResponse create(@RequestBody Projects projects) {
- projects.setCreator(getLoginUser().getId());
- projects.setEditor(getLoginUser().getId());
+ public ApiResponse create(@RequestBody Projects projects,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ projects.setCreator(getLoginUser(token).getId());
+ projects.setEditor(getLoginUser(token).getId());
return ApiResponse.success(projectsService.create(projects));
}
@@ -65,7 +66,8 @@
@ApiOperation("鏍规嵁ID淇敼")
@PostMapping("/updateById")
@CloudRequiredPermission("business:projects:update")
- public ApiResponse updateById(@RequestBody Projects projects) {
+ public ApiResponse updateById(@RequestBody Projects projects,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ projects.setEditor(getLoginUser(token).getId());
projectsService.updateById(projects);
return ApiResponse.success(null);
}
--
Gitblit v1.9.3