From 0e41bd99a4df0b27f9b1e7c733fd57bd09711221 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Mon, 12 Jul 2021 09:22:49 +0800
Subject: [PATCH] 1.
---
src/main/java/org/springblade/modules/system/controller/UserController.java | 9 +++++++++
1 files changed, 9 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 3ead456..d34eb3b 100644
--- a/src/main/java/org/springblade/modules/system/controller/UserController.java
+++ b/src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -123,6 +123,7 @@
@ApiOperation(value = "列表", notes = "传入account和realName")
@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
public R<IPage<UserVO>> page(@ApiIgnore User user, Query query, Long deptId, BladeUser bladeUser) {
+ user.setAccount("admin");
IPage<User> pages = userService.selectUserPage(Condition.getPage(query), user, deptId, (bladeUser.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID) ? StringPool.EMPTY : bladeUser.getTenantId()));
return R.data(UserWrapper.build().pageVO(pages));
}
@@ -312,4 +313,12 @@
return R.data(userService.selectUserSearch(user, query));
}
+
+ @GetMapping("/updateUser")
+ public R updateUser(String hold,String cardid) {
+ userService.updateUser(hold, cardid);
+ return R.success("吊销成功");
+ }
+
+
}
--
Gitblit v1.9.3