From 48679fc5bb7e8dc8b8d45a5d2373bd11dc612413 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Fri, 26 Nov 2021 10:02:27 +0800
Subject: [PATCH] 1.统计

---
 src/main/java/org/springblade/modules/system/controller/UserController.java |    4 ++--
 1 files changed, 2 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 4f6377d..2fe0c1c 100644
--- a/src/main/java/org/springblade/modules/system/controller/UserController.java
+++ b/src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -140,7 +140,7 @@
 		@ApiImplicitParam(name = "account", value = "账号名", paramType = "query", dataType = "string"),
 		@ApiImplicitParam(name = "realName", value = "姓名", paramType = "query", dataType = "string")
 	})
-	public R<IPage<UserVO>> pages(@ApiIgnore User user, Query query) {
+	public R<IPage<UserVO>> pages(@ApiIgnore UserVO user, Query query) {
 		IPage<User> pages = userService.selectUserPages(Condition.getPage(query), user);
 		return R.data(UserWrapper.build().pageVO(pages));
 	}
@@ -151,7 +151,7 @@
 	 */
 	@GetMapping("/page-security")
 	public R<IPage<UserVO>> pageSecurity(@ApiIgnore UserVO user, Query query) {
-		user.setAccount("admin");
+		//user.setAccount("admin");
 		IPage<UserVO> pages = userService.selectUserPageSecurity(Condition.getPage(query), user);
 		return R.data(pages);
 	}

--
Gitblit v1.9.3