From 745aa438226dabcf78c144e6b35bccc00f9e7626 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Thu, 28 Dec 2023 16:12:12 +0800
Subject: [PATCH] 新增用户详情查询接口
---
src/main/java/org/springblade/modules/system/controller/UserController.java | 25 ++++++++++++++++++++-----
1 files changed, 20 insertions(+), 5 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 7b4d318..1b5cbc1 100644
--- a/src/main/java/org/springblade/modules/system/controller/UserController.java
+++ b/src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -116,16 +116,21 @@
}
@GetMapping("/searchUser")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "account", value = "账号名", paramType = "query", dataType = "string"),
- @ApiImplicitParam(name = "realName", value = "姓名", paramType = "query", dataType = "string")
- })
@ApiOperationSupport(order = 3)
- @ApiOperation(value = "搜索用户", notes = "传入account和realName")
+ @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));
}
/**
@@ -355,4 +360,14 @@
return R.success("操作成功");
}
+ /**
+ * 获取用户信息
+ * @return
+ */
+ @GetMapping("/getUserInfo")
+ public R getUserInfo(){
+ //根据保安员编码查询保安员信息
+ return R.data(userService.getUserInfo(AuthUtil.getUserId()));
+ }
+
}
--
Gitblit v1.9.3