From 62084735c1f5d6b6d4771aadf4d9241479a4d4ee Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 24 Oct 2022 15:06:16 +0800
Subject: [PATCH] 用户查询增加模糊查询；修复当编辑用户时账号解封的问题；全景管理查询未删除的数据；当性别，生日未填时数据库同时也录入数据
---
src/main/java/org/springblade/modules/system/controller/UserController.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 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 82139b1..dcacc71 100644
--- a/src/main/java/org/springblade/modules/system/controller/UserController.java
+++ b/src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -83,7 +83,7 @@
@ApiOperationSupport(order = 1)
@ApiOperation(value = "查看详情", notes = "传入id")
@GetMapping("/detail")
- @PreAuth(RoleConstant.HAS_ROLE_ADMIN)
+ @PreAuth("hasAnyRole('administrator,admin,user')")
public R<UserVO> detail(User user) {
User detail = userService.getOne(Condition.getQueryWrapper(user));
return R.data(UserWrapper.build().entityVO(detail));
@@ -152,7 +152,7 @@
@ApiOperationSupport(order = 5)
@ApiOperation(value = "修改", notes = "传入User")
public R update(@Valid @RequestBody User user) {
- CacheUtil.clear(USER_CACHE);
+// CacheUtil.clear(USER_CACHE);
return R.status(userService.updateUser(user));
}
@@ -333,4 +333,13 @@
return R.success("操作成功");
}
+ /**
+ * 查询用户信息
+ * @param user
+ * @return
+ */
+ @GetMapping("/getUserList")
+ public R getUserList(UserVO user){
+ return R.data(userService.getUserList(user));
+ }
}
--
Gitblit v1.9.3