From 04bf59bbc3fad774c57a2ee5ebf07db24b476bf2 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期二, 17 十二月 2024 17:43:14 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
server/system_service/src/main/java/com/doumee/api/system/SystemDepartmentController.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/server/system_service/src/main/java/com/doumee/api/system/SystemDepartmentController.java b/server/system_service/src/main/java/com/doumee/api/system/SystemDepartmentController.java
index f013ef7..7d341f0 100644
--- a/server/system_service/src/main/java/com/doumee/api/system/SystemDepartmentController.java
+++ b/server/system_service/src/main/java/com/doumee/api/system/SystemDepartmentController.java
@@ -8,6 +8,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.system.dto.QuerySystemUserDTO;
import com.doumee.dao.system.model.SystemDepartment;
import com.doumee.dao.system.vo.SystemDepartmentListVO;
@@ -44,9 +45,9 @@
@ApiOperation("鏂板缓")
@PostMapping("/create")
@RequiresPermissions("system:department:create")
- public ApiResponse create(@Validated(OperaType.Create.class) @RequestBody SystemDepartment systemDepartment) {
- systemDepartment.setCreateUser(getLoginUser().getId());
- systemDepartment.setUpdateUser(getLoginUser().getId());
+ public ApiResponse create(@Validated(OperaType.Create.class) @RequestBody SystemDepartment systemDepartment, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ systemDepartment.setCreateUser(this.getLoginUser(token).getId());
+ systemDepartment.setUpdateUser(this.getLoginUser(token).getId());
return ApiResponse.success(systemDepartmentBiz.create(systemDepartment));
}
@@ -75,9 +76,9 @@
@ApiOperation("淇敼")
@PostMapping("/updateById")
@RequiresPermissions("system:department:update")
- public ApiResponse updateById(@Validated(OperaType.Update.class) @RequestBody SystemDepartment systemDepartment) {
- systemDepartment.setCreateUser(getLoginUser().getId());
- systemDepartment.setUpdateUser(getLoginUser().getId());
+ public ApiResponse updateById(@Validated(OperaType.Update.class) @RequestBody SystemDepartment systemDepartment, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ systemDepartment.setCreateUser(this.getLoginUser(token).getId());
+ systemDepartment.setUpdateUser(this.getLoginUser(token).getId());
systemDepartmentBiz.updateById(systemDepartment);
return ApiResponse.success(null);
}
--
Gitblit v1.9.3