From 23ea6c8a9488b2d271a2389e2992ce7baefc77d9 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Sun, 22 Aug 2021 11:46:44 +0800
Subject: [PATCH] 1.ftp

---
 src/main/java/org/springblade/modules/system/controller/UserController.java |   14 ++++++++++++++
 1 files changed, 14 insertions(+), 0 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 4e7593c..9bb8712 100644
--- a/src/main/java/org/springblade/modules/system/controller/UserController.java
+++ b/src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -132,6 +132,20 @@
 
 
 	/**
+	 * 自定义用户列表,
+	 */
+	@GetMapping("/pages")
+	@ApiImplicitParams({
+		@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) {
+		IPage<User> pages = userService.selectUserPages(Condition.getPage(query), user);
+		return R.data(UserWrapper.build().pageVO(pages));
+	}
+
+
+	/**
 	 * 自定义用户列表(只有保安员)
 	 */
 	@GetMapping("/page-security")

--
Gitblit v1.9.3