From 486f6cda7ccd893f7ff91c088b2f26b991a08f2b Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Thu, 09 Dec 2021 11:36:18 +0800
Subject: [PATCH] 1.首页现实表现
---
src/main/java/org/springblade/modules/system/controller/UserController.java | 14 ++++++++++++--
1 files changed, 12 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..bdf1ab4 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);
}
@@ -372,5 +372,15 @@
return R.success("吊销成功");
}
+ /**
+ * 查询押运人员
+ *
+ * @return
+ */
+ @GetMapping("/selectPeo")
+ public R selectPeo(@ApiIgnore UserVO user) {
+ List list = userService.selectPeo(user);
+ return R.data(list);
+ }
}
--
Gitblit v1.9.3