From 5ac3480a9ebdcf1a45572c7508c1723136e9563e Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 02 Apr 2021 11:03:03 +0800
Subject: [PATCH] 用户新增状态
---
blade-service/blade-user/src/main/java/org/springblade/system/user/controller/UserController.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 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 457c3b9..1447fc2 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
@@ -138,7 +138,7 @@
@ApiOperation(value = "列表", notes = "传入account和realName")
//@PreAuth(RoleConstant.HAS_ROLE_ADMIN)
public R<IPage<UserVO>> pages(@ApiIgnore User user, Query query, Long deptId, BladeUser bladeUser) {
- IPage<User> pages = userService.selectUserPages(Condition.getPage(query), user, deptId, (bladeUser.getTenantId().equals(BladeConstant.ADMIN_TENANT_ID) ? StringPool.EMPTY : bladeUser.getTenantId()));
+ IPage<User> pages = userService.selectUserPages(Condition.getPage(query), user, deptId);
return R.data(UserWrapper.build().pageVO(pages));
}
@@ -151,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));
}
--
Gitblit v1.9.3