From 73d958e6fc5c3cc3a74446b6cead4e3e8806ba84 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 07 May 2021 14:59:07 +0800
Subject: [PATCH] 保安筛选逻辑调整
---
blade-service/blade-user/src/main/java/org/springblade/system/user/controller/UserController.java | 42 ++++++++++++++++++++++++++++++++++++++++++
1 files changed, 42 insertions(+), 0 deletions(-)
diff --git a/blade-service/blade-user/src/main/java/org/springblade/system/user/controller/UserController.java b/blade-service/blade-user/src/main/java/org/springblade/system/user/controller/UserController.java
index 3fc2ba7..bd1d254 100644
--- a/blade-service/blade-user/src/main/java/org/springblade/system/user/controller/UserController.java
+++ b/blade-service/blade-user/src/main/java/org/springblade/system/user/controller/UserController.java
@@ -127,6 +127,22 @@
}
/**
+ * 自定义用户列表(带坐标)
+ */
+ @GetMapping("/pages")
+ @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>> pages(@ApiIgnore User user, Query query, String deptId, BladeUser bladeUser) {
+ IPage<User> pages = userService.selectUserPages(Condition.getPage(query), user, deptId);
+ return R.data(UserWrapper.build().pageVO(pages));
+ }
+
+ /**
* 新增或修改
*/
@PostMapping("/submit")
@@ -135,6 +151,14 @@
//@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
public R submit(@Valid @RequestBody User user) {
CacheUtil.clear(USER_CACHE);
+
+ if (user.getOnline_status().equals("") || user.getOnline_status() == null){
+ user.setOnline_status("0");
+ }
+ if (user.getWork_status().equals("") || user.getWork_status() == null){
+ user.setWork_status("0");
+ }
+
return R.status(userService.submit(user));
}
@@ -146,6 +170,15 @@
@ApiOperation(value = "修改", notes = "传入User")
public R update(@Valid @RequestBody User user) {
CacheUtil.clear(USER_CACHE);
+
+ if (user.getOnline_status().equals("") || user.getOnline_status() == null){
+ user.setOnline_status("0");
+ }
+ if (user.getWork_status().equals("") || user.getWork_status() == null){
+ user.setWork_status("0");
+ }
+
+
return R.status(userService.updateUser(user));
}
@@ -310,4 +343,13 @@
return R.data(userService.selectSecurityUserList(Condition.getPage(query),user));
}
+ /**
+ * 查询单条
+ */
+ @PostMapping("/details")
+ public R<UserVO> details(User user) {
+ User detail = userService.getOne(Condition.getQueryWrapper(user));
+ return R.data(UserWrapper.build().entityVO(detail));
+ }
+
}
--
Gitblit v1.9.3