From d4be41ccac01b155c7a067c73f2045f9ea0aa805 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 21 十月 2024 15:15:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/system_service/src/main/java/com/doumee/api/cloud/SystemDepartmentCloudController.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/server/system_service/src/main/java/com/doumee/api/cloud/SystemDepartmentCloudController.java b/server/system_service/src/main/java/com/doumee/api/cloud/SystemDepartmentCloudController.java
index 9791e39..5f9f971 100644
--- a/server/system_service/src/main/java/com/doumee/api/cloud/SystemDepartmentCloudController.java
+++ b/server/system_service/src/main/java/com/doumee/api/cloud/SystemDepartmentCloudController.java
@@ -32,7 +32,7 @@
*/
@Api(tags = "閮ㄩ棬")
@RestController
-@RequestMapping("/cloudService/system/department")
+@RequestMapping(Constants.CLOUD_SERVICE_URL_INDEX+"/system/department")
public class SystemDepartmentCloudController extends BaseController {
@Autowired
@@ -46,8 +46,8 @@
@PostMapping("/create")
@CloudRequiredPermission("system:department:create")
public ApiResponse create(@RequestHeader(Constants.HEADER_USER_TOKEN) String token,@Validated(OperaType.Create.class) @RequestBody SystemDepartment systemDepartment) {
- systemDepartment.setCreateUser(getLoginUser().getId());
- systemDepartment.setUpdateUser(getLoginUser().getId());
+ systemDepartment.setCreateUser(getLoginUser(token).getId());
+ systemDepartment.setUpdateUser(getLoginUser(token).getId());
return ApiResponse.success(systemDepartmentBiz.create(systemDepartment));
}
@@ -77,8 +77,8 @@
@PostMapping("/updateById")
@CloudRequiredPermission("system:department:update")
public ApiResponse updateById(@RequestHeader(Constants.HEADER_USER_TOKEN) String token,@Validated(OperaType.Update.class) @RequestBody SystemDepartment systemDepartment) {
- systemDepartment.setCreateUser(getLoginUser().getId());
- systemDepartment.setUpdateUser(getLoginUser().getId());
+ systemDepartment.setCreateUser(getLoginUser(token).getId());
+ systemDepartment.setUpdateUser(getLoginUser(token).getId());
systemDepartmentBiz.updateById(systemDepartment);
return ApiResponse.success(null);
}
--
Gitblit v1.9.3