From b33f2e78ffd4fd401698b84a33dc3c293793c62f Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期二, 18 二月 2025 16:22:33 +0800 Subject: [PATCH] 最新版本541200007 --- server/system_service/src/main/java/com/doumee/api/cloud/SystemUserCloudController.java | 21 ++++++++++++++++----- 1 files changed, 16 insertions(+), 5 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 63b6a70..1e7c84e 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 @@ -6,9 +6,9 @@ import com.doumee.core.annotation.pr.PreventRepeat; import com.doumee.core.annotation.trace.Trace; import com.doumee.core.constants.OperaType; -import com.doumee.core.model.ApiResponse; -import com.doumee.core.model.PageData; -import com.doumee.core.model.PageWrap; +import com.doumee.service.business.third.model.ApiResponse; +import com.doumee.service.business.third.model.PageData; +import com.doumee.service.business.third.model.PageWrap; import com.doumee.core.utils.Constants; import com.doumee.dao.system.dto.CreateSystemUserDTO; import com.doumee.dao.system.dto.CreateUserRoleDTO; @@ -58,6 +58,7 @@ @CloudRequiredPermission("system:user:resetPwd") public ApiResponse resetPwd (@RequestHeader(Constants.HEADER_USER_TOKEN) String token,@Validated @RequestBody ResetSystemUserPwdDTO dto) { dto.setOperaUserId(this.getLoginUser(token).getId()); + dto.setNeedChangePwd(Constants.ZERO); systemUserBiz.resetPwd(dto); return ApiResponse.success(null); } @@ -111,8 +112,12 @@ return ApiResponse.success(systemUserService.findPage(pageWrap)); } - - + @ApiOperation("鍒嗛〉鏌ヨ鍙告満鍒楄〃") + @PostMapping("/pageDriver") + @CloudRequiredPermission("system:user:query") + public ApiResponse<PageData<SystemUser>> findDriverPage (@RequestBody PageWrap<SystemUser> pageWrap) { + return ApiResponse.success(systemUserService.findDriverPage(pageWrap)); + } @ApiOperation("鏌ヨ鎵�鏈夌郴缁熺敤鎴�") @@ -122,6 +127,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