From eceb0c8f9480995c8a17f1d093f4e658268b234c Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 16 Jul 2021 15:46:30 +0800
Subject: [PATCH] 警情任务分类显示问题修复

---
 src/main/java/org/springblade/modules/system/controller/UserController.java |   17 +++++++++++++++++
 1 files changed, 17 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 5d70177..3032cb3 100644
--- a/src/main/java/org/springblade/modules/system/controller/UserController.java
+++ b/src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -178,6 +178,23 @@
 		IPage<User> pages = userService.selectUserPages(Condition.getPage(query), user, deptId);
 		return R.data(UserWrapper.build().pageVO(pages));
 	}
+
+	/**
+	 * 自定义用户列表(带坐标)
+	 */
+	@GetMapping("/pagetxl")
+	@ApiImplicitParams({
+		@ApiImplicitParam(name = "account", value = "账号名", paramType = "query", dataType = "string"),
+		@ApiImplicitParam(name = "realName", value = "姓名", paramType = "query", dataType = "string")
+	})
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "列表", notes = "传入account和realName")
+	//@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
+	public R<IPage<UserVO>> pagetxl(@ApiIgnore User user, Query query, String deptId, BladeUser bladeUser) {
+		IPage<User> pages = userService.selectUserPagetxl(Condition.getPage(query), user, deptId);
+		return R.data(UserWrapper.build().pageVO(pages));
+	}
+
 	/**
 	 * 新增或修改
 	 */

--
Gitblit v1.9.3