From 6beeb715fcef8db22b17c309ec8fecc45cc04b00 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Tue, 17 Aug 2021 16:30:47 +0800
Subject: [PATCH] 1.考试成绩查询修改 2.用户查询修改
---
src/main/java/org/springblade/modules/system/controller/UserController.java | 35 +++++++++++++++++++++--------------
1 files changed, 21 insertions(+), 14 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 08f7d12..1c8f495 100644
--- a/src/main/java/org/springblade/modules/system/controller/UserController.java
+++ b/src/main/java/org/springblade/modules/system/controller/UserController.java
@@ -170,6 +170,19 @@
//@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
public R submit(@Valid @RequestBody User user) throws Exception {
CacheUtil.clear(USER_CACHE);
+ //查询角色
+ if (null!=user.getRoleId()){
+ Role role = new Role();
+ role.setId(Long.parseLong(user.getRoleId()));
+ Role one = roleService.getOne(Condition.getQueryWrapper(role));
+ if (one.getRoleAlias().equals("保安")){
+ user.setHold("1");
+ }
+ if (one.getRoleAlias().equals("未持证保安")){
+ user.setHold("2");
+ }
+ }
+
return R.status(userService.submit(user));
}
@@ -350,10 +363,8 @@
* 自定义用户列表(只有保安员)
*/
@GetMapping("/page-security")
- public R<IPage<UserVO>> pageSecurity(@ApiIgnore User user, Query query, Long deptId, BladeUser bladeUser) {
- user.setAccount("admin");
- bladeUser.setTenantId("000000");
- IPage<User> pages = userService.selectUserPageSecurity(Condition.getPage(query), user, deptId, "000000");
+ public R<IPage<UserVO>> pageSecurity(@ApiIgnore User user, Query query) {
+ IPage<User> pages = userService.selectUserPageSecurity(Condition.getPage(query), user);
return R.data(UserWrapper.build().pageVO(pages));
}
@@ -361,10 +372,8 @@
* 自定义用户列表(只有保安员)
*/
@GetMapping("/page-security-unit")
- public List<User> pageSecurityUnit(@ApiIgnore User user, Query query, Long deptId, BladeUser bladeUser) {
- user.setAccount("admin");
- bladeUser.setTenantId("000000");
- List<User> pages = userService.selectUserPageSecurityUnit(Condition.getPage(query), user, deptId, "000000");
+ public List<User> pageSecurityUnit(@ApiIgnore User user, Query query) {
+ List<User> pages = userService.selectUserPageSecurityUnit(Condition.getPage(query), user);
return pages;
}
@@ -372,9 +381,8 @@
* 自定义用户列表(只有保安员)
*/
@GetMapping("/page-security-units")
- public R pageSecurityUnits(@ApiIgnore User user, Query query, Long deptId, BladeUser bladeUser) {
- bladeUser.setTenantId("000000");
- List<User> pages = userService.selectUserPageSecurityUnit(Condition.getPage(query), user, deptId, "000000");
+ public R pageSecurityUnits(@ApiIgnore User user, Query query) {
+ List<User> pages = userService.selectUserPageSecurityUnit(Condition.getPage(query),user);
return R.data(pages);
}
@@ -382,9 +390,8 @@
* 保安员列表，帅选无保安证
*/
@GetMapping("/page-security-apply")
- public R<IPage<UserVO>> pageSecurityApply(@ApiIgnore UserVO user, Query query, Long deptId, BladeUser bladeUser) {
- bladeUser.setTenantId("000000");
- IPage<UserVO> pages = userService.selectUserPageSecurityApply(Condition.getPage(query), user, deptId, "000000");
+ public R<IPage<UserVO>> pageSecurityApply(@ApiIgnore UserVO user, Query query) {
+ IPage<UserVO> pages = userService.selectUserPageSecurityApply(Condition.getPage(query), user);
return R.data(pages);
}
--
Gitblit v1.9.3