From 16e8c7adbee6c9ee9bac09a80d44d3bfd3fe2f0c Mon Sep 17 00:00:00 2001 From: k94314517 <8417338+k94314517@user.noreply.gitee.com> Date: 星期一, 19 五月 2025 09:45:38 +0800 Subject: [PATCH] Merge branch '2.0.2' into 2.0.1 --- server/platform/src/main/java/com/doumee/api/system/SystemUserController.java | 31 +++++++++++++++++++++++++++++++ 1 files changed, 31 insertions(+), 0 deletions(-) diff --git a/server/platform/src/main/java/com/doumee/api/system/SystemUserController.java b/server/platform/src/main/java/com/doumee/api/system/SystemUserController.java index 74d0a7c..8ca288d 100644 --- a/server/platform/src/main/java/com/doumee/api/system/SystemUserController.java +++ b/server/platform/src/main/java/com/doumee/api/system/SystemUserController.java @@ -8,6 +8,8 @@ import com.doumee.core.constants.OperaType; import com.doumee.core.model.PageData; import com.doumee.core.model.PageWrap; +import com.doumee.core.utils.Constants; +import com.doumee.dao.business.model.Member; import com.doumee.dao.system.dto.CreateSystemUserDTO; import com.doumee.dao.system.dto.CreateUserRoleDTO; import com.doumee.dao.system.dto.QuerySystemUserDTO; @@ -70,6 +72,17 @@ systemUserBiz.create(systemUser); return ApiResponse.success(null); } + + @Trace(withRequestParameters = false) + @PreventRepeat + @ApiOperation("鏂板缓浼佷笟鎴栬�呭晢鎴疯处鍙�") + @PostMapping("/createCompany") + @RequiresPermissions("system:user:create") + public ApiResponse createCompany(@Validated(OperaType.Create.class) @RequestBody CreateSystemUserDTO systemUser) { + systemUser.setCreateUser(this.getLoginUser().getId()); + systemUserBiz.createCompany(systemUser); + return ApiResponse.success(null); + } @PreventRepeat @ApiOperation("淇敼鐢ㄦ埛鐘舵��") @GetMapping("/updUserStatus") @@ -117,6 +130,15 @@ public ApiResponse<PageData<SystemUserListVO>> findPage (@RequestBody PageWrap<QuerySystemUserDTO> pageWrap) { return ApiResponse.success(systemUserService.findPage(pageWrap)); } + + + + @ApiOperation("鍒嗛〉鏌ヨ") + @PostMapping("/pageCompany") + @RequiresPermissions("system:user:query") + public ApiResponse<PageData<SystemUserListVO>> findPageCompany (@RequestBody PageWrap<QuerySystemUserDTO> pageWrap) { + return ApiResponse.success(systemUserService.findPageCompany(pageWrap)); + } @ApiOperation("鍒嗛〉鏌ヨ绯荤粺鐢ㄦ埛") @PostMapping("/findAllPage") @RequiresPermissions("system:user:query") @@ -139,4 +161,13 @@ return ApiResponse.success(systemUserService.findById(id)); } + + @ApiOperation("璁剧疆鎴栧彇娑堜富绠�") + @PostMapping("/updateHead") + @RequiresPermissions("system:user:query") + public ApiResponse updateHead(@RequestBody SystemUser systemUser){ + systemUserService.updateHead(systemUser); + return ApiResponse.success(null); + } + } -- Gitblit v1.9.3