From 53b6400ec10c8ca61ccec91c82c358d2488eead8 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 20 十二月 2024 09:50:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/system_service/src/main/java/com/doumee/api/cloud/SystemUserCloudController.java | 24 ++++++++++++++----------
1 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/server/system_service/src/main/java/com/doumee/api/cloud/SystemUserCloudController.java b/server/system_service/src/main/java/com/doumee/api/cloud/SystemUserCloudController.java
index a35d13a..882d368 100644
--- a/server/system_service/src/main/java/com/doumee/api/cloud/SystemUserCloudController.java
+++ b/server/system_service/src/main/java/com/doumee/api/cloud/SystemUserCloudController.java
@@ -45,7 +45,8 @@
@ApiOperation("閰嶇疆鐢ㄦ埛瑙掕壊")
@PostMapping("/createUserRole")
@CloudRequiredPermission("system:user:createUserRole")
- public ApiResponse createUserRole (@Validated @RequestBody CreateUserRoleDTO dto) {
+ public ApiResponse createUserRole (@RequestHeader(Constants.HEADER_USER_TOKEN) String token,@Validated @RequestBody CreateUserRoleDTO dto) {
+ dto.setCreateUser(this.getLoginUser(token).getId());
systemUserBiz.createUserRole(dto);
return ApiResponse.success(null);
}
@@ -55,8 +56,8 @@
@ApiOperation("閲嶇疆鐢ㄦ埛瀵嗙爜")
@PostMapping("/resetPwd")
@CloudRequiredPermission("system:user:resetPwd")
- public ApiResponse resetPwd (@Validated @RequestBody ResetSystemUserPwdDTO dto) {
- dto.setOperaUserId(this.getLoginUser().getId());
+ public ApiResponse resetPwd (@RequestHeader(Constants.HEADER_USER_TOKEN) String token,@Validated @RequestBody ResetSystemUserPwdDTO dto) {
+ dto.setOperaUserId(this.getLoginUser(token).getId());
systemUserBiz.resetPwd(dto);
return ApiResponse.success(null);
}
@@ -66,8 +67,8 @@
@ApiOperation("鏂板缓")
@PostMapping("/create")
@CloudRequiredPermission("system:user:create")
- public ApiResponse create(@Validated(OperaType.Create.class) @RequestBody CreateSystemUserDTO systemUser) {
- systemUser.setCreateUser(this.getLoginUser().getId());
+ public ApiResponse create(@RequestHeader(Constants.HEADER_USER_TOKEN) String token,@Validated(OperaType.Create.class) @RequestBody CreateSystemUserDTO systemUser) {
+ systemUser.setCreateUser(this.getLoginUser(token).getId());
systemUserBiz.create(systemUser);
return ApiResponse.success(null);
}
@@ -97,8 +98,8 @@
@ApiOperation("淇敼")
@PostMapping("/updateById")
@CloudRequiredPermission("system:user:update")
- public ApiResponse updateById( @RequestBody CreateSystemUserDTO systemUser) {
- systemUser.setUpdateUser(this.getLoginUser().getId());
+ public ApiResponse updateById(@RequestHeader(Constants.HEADER_USER_TOKEN) String token, @RequestBody CreateSystemUserDTO systemUser) {
+ systemUser.setUpdateUser(this.getLoginUser(token).getId());
systemUserBiz.updateById(systemUser);
return ApiResponse.success(null);
}
@@ -111,9 +112,6 @@
}
-
-
-
@ApiOperation("鏌ヨ鎵�鏈夌郴缁熺敤鎴�")
@PostMapping("/findAllList")
@CloudRequiredPermission("system:user:query")
@@ -121,6 +119,12 @@
return ApiResponse.success(systemUserService.findAllList(pageWrap));
}
+ @ApiOperation("鏌ヨ鎵�鏈夊唴閮ㄤ汉鍛樼敤鎴�")
+ @PostMapping("/findInternalList")
+ @CloudRequiredPermission("system:user:query")
+ public ApiResponse<List<SystemUser>> findInternalList () {
+ return ApiResponse.success(systemUserService.findInternalList());
+ }
@ApiOperation("鏍规嵁ID鏌ヨ")
@GetMapping("/{id}")
--
Gitblit v1.9.3