From 55d677758efadb6d42e6d4e595cecc2c50c20d5a Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Sat, 23 Dec 2023 17:19:12 +0800
Subject: [PATCH] bug修复
---
src/main/java/org/springblade/modules/system/controller/UserController.java | 18 ++++++++++++++++++
1 files changed, 18 insertions(+), 0 deletions(-)
diff --git a/src/main/java/org/springblade/modules/system/controller/UserController.java b/src/main/java/org/springblade/modules/system/controller/UserController.java
index 3cf58f6..5a76a45 100644
--- a/src/main/java/org/springblade/modules/system/controller/UserController.java
+++ b/src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -115,6 +115,24 @@
return R.data(UserWrapper.build().pageVO(pages));
}
+ @GetMapping("/searchUser")
+ @ApiOperationSupport(order = 3)
+ @ApiOperation(value = "搜索用户", notes = "传入name")
+ @PreAuth(RoleConstant.HAS_ROLE_ADMIN)
+ public R<List<UserVO>> searchUser(@ApiIgnore User user, Query query, Long deptId, BladeUser bladeUser) {
+ IPage<User> pages = userService.selectUserPage(Condition.getPage(query), user, deptId, (bladeUser.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID) ? StringPool.EMPTY : bladeUser.getTenantId()));
+ return R.data(UserWrapper.build().listVO(pages.getRecords()));
+ }
+
+ @GetMapping("/searchUserByDistrictId")
+ @ApiOperationSupport(order = 3)
+ @ApiOperation(value = "通过小区Id搜索用户", notes = "传入districtId")
+ // @PreAuth(RoleConstant.HAS_ROLE_ADMIN)
+ public R<List<UserVO>> searchUserByDistrictId(String districtId) {
+ List<User> resutl = userService.searchUserByDistrictId(districtId);
+ return R.data(UserWrapper.build().listVO(resutl));
+ }
+
/**
* 自定义用户列表
*/
--
Gitblit v1.9.3