From fc299368cffdd0f1091cd7e9580cf046b4d65dde Mon Sep 17 00:00:00 2001
From: lihang <lihang@vci-tech.com>
Date: 星期四, 13 七月 2023 10:13:37 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs
---
Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/controller/UserController.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/controller/UserController.java b/Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/controller/UserController.java
index 4fe20fa..a71e215 100644
--- a/Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/controller/UserController.java
+++ b/Source/UBCS/ubcs-service/ubcs-user/src/main/java/com/vci/ubcs/system/user/controller/UserController.java
@@ -142,6 +142,12 @@
return R.data(UserWrapper.build().pageVO(pages));
}
+ @GetMapping("/allPage")
+ public R<List<UserVO>> allPage(User user,Long deptId) {
+ List<User> userss = userService.selectAllUser(user,deptId);
+ return R.data(UserWrapper.build().listVO(userss));
+ }
+
/**
* 鏂板鎴栦慨鏀�
*/
@@ -310,7 +316,6 @@
return R.data(userService.platformDetail(user));
}
-
/**
* 鐢ㄦ埛鍒楄〃鏌ヨ
*/
@@ -355,4 +360,6 @@
return R.data(res);
}
+
+
}
--
Gitblit v1.9.3