From 5c63d3fa13956182f999a02ebd291161cf1b32bc Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期五, 03 一月 2025 18:22:42 +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/cloud/SystemUserCloudController.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 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..cb1b9bb 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
@@ -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