From 133c60c8787d9cf67ae8bd290be03ecdf01691e9 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Wed, 24 Mar 2021 18:22:46 +0800
Subject: [PATCH] 用户管理问题修复
---
blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.xml | 2 +-
blade-service/blade-user/src/main/java/org/springblade/system/user/controller/UserController.java | 9 +++++++++
2 files changed, 10 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 3fc2ba7..80822f5 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
@@ -146,6 +146,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));
}
diff --git a/blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.xml b/blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.xml
index 70b9d65..b468fae 100644
--- a/blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.xml
+++ b/blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.xml
@@ -26,7 +26,7 @@
<result column="dept_id" property="deptId"/>
<result column="post_id" property="postId"/>
<result column="online_status" property="online_status"/>
- <result column="channlId" property="channlId"/>
+ <result column="work_status" property="work_status"/>
</resultMap>
<select id="selectUserPage" resultMap="userResultMap">
--
Gitblit v1.9.3