From 6b6725aac343f6decf4e475ff8b03f5b474e5759 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Tue, 18 Oct 2022 10:49:37 +0800
Subject: [PATCH] 拦截farm请求和user请求;用户详情接口增加preAuth注解

---
 src/main/java/org/springblade/modules/system/controller/UserController.java |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 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..705500a 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));
@@ -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