From f24c180ae9afa33ddef6ff1aa73baa35df73f2ca Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 24 Aug 2021 11:14:12 +0800
Subject: [PATCH] 用户新增发证时间字段
---
src/main/java/org/springblade/modules/system/controller/UserController.java | 16 +++++++++++++++-
1 files changed, 15 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 4e7593c..5af37f4 100644
--- a/src/main/java/org/springblade/modules/system/controller/UserController.java
+++ b/src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -80,7 +80,7 @@
@ApiOperationSupport(order = 1)
@ApiOperation(value = "查看详情", notes = "传入id")
@GetMapping("/detail")
- @PreAuth(RoleConstant.HAS_ROLE_ADMIN)
+ //@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
public R<UserVO> detail(User user) {
User detail = userService.getOne(Condition.getQueryWrapper(user));
return R.data(UserWrapper.build().entityVO(detail));
@@ -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