From 73d958e6fc5c3cc3a74446b6cead4e3e8806ba84 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 07 May 2021 14:59:07 +0800
Subject: [PATCH] 保安筛选逻辑调整
---
blade-service/blade-user/src/main/java/org/springblade/system/user/controller/UserController.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/blade-service/blade-user/src/main/java/org/springblade/system/user/controller/UserController.java b/blade-service/blade-user/src/main/java/org/springblade/system/user/controller/UserController.java
index 1447fc2..bd1d254 100644
--- a/blade-service/blade-user/src/main/java/org/springblade/system/user/controller/UserController.java
+++ b/blade-service/blade-user/src/main/java/org/springblade/system/user/controller/UserController.java
@@ -137,7 +137,7 @@
@ApiOperationSupport(order = 3)
@ApiOperation(value = "列表", notes = "传入account和realName")
//@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
- public R<IPage<UserVO>> pages(@ApiIgnore User user, Query query, Long deptId, BladeUser bladeUser) {
+ public R<IPage<UserVO>> pages(@ApiIgnore User user, Query query, String deptId, BladeUser bladeUser) {
IPage<User> pages = userService.selectUserPages(Condition.getPage(query), user, deptId);
return R.data(UserWrapper.build().pageVO(pages));
}
@@ -343,4 +343,13 @@
return R.data(userService.selectSecurityUserList(Condition.getPage(query),user));
}
+ /**
+ * 查询单条
+ */
+ @PostMapping("/details")
+ public R<UserVO> details(User user) {
+ User detail = userService.getOne(Condition.getQueryWrapper(user));
+ return R.data(UserWrapper.build().entityVO(detail));
+ }
+
}
--
Gitblit v1.9.3