From 459c27b45dacfe0414e037dba3a7bfa346a9602b Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 16 Jun 2021 11:47:37 +0800
Subject: [PATCH] 1.新增修改用户信息接口 2.修改老的修改用户接口，判null 放至前面，防止空指针异常
---
blade-service/blade-user/src/main/java/org/springblade/system/user/controller/UserController.java | 35 ++++++++++++++++++++++++-----------
1 files changed, 24 insertions(+), 11 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 bd1d254..3a5f79a 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
@@ -30,14 +30,13 @@
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.BladeUser;
-import org.springblade.core.secure.annotation.PreAuth;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tenant.annotation.NonDS;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.constant.BladeConstant;
-import org.springblade.core.tool.constant.RoleConstant;
import org.springblade.core.tool.utils.DateUtil;
import org.springblade.core.tool.utils.StringPool;
+import org.springblade.system.entity.Role;
import org.springblade.system.user.entity.User;
import org.springblade.system.user.excel.UserExcel;
import org.springblade.system.user.excel.UserImporter;
@@ -152,10 +151,10 @@
public R submit(@Valid @RequestBody User user) {
CacheUtil.clear(USER_CACHE);
- if (user.getOnline_status().equals("") || user.getOnline_status() == null){
+ if (user.getOnline_status() == null || user.getOnline_status().equals("")){
user.setOnline_status("0");
}
- if (user.getWork_status().equals("") || user.getWork_status() == null){
+ if (null == user.getWork_status() || user.getWork_status().equals("")){
user.setWork_status("0");
}
@@ -171,13 +170,12 @@
public R update(@Valid @RequestBody User user) {
CacheUtil.clear(USER_CACHE);
- if (user.getOnline_status().equals("") || user.getOnline_status() == null){
+ if (user.getOnline_status() == null || user.getOnline_status().equals("")){
user.setOnline_status("0");
}
- if (user.getWork_status().equals("") || user.getWork_status() == null){
+ if (user.getWork_status() == null || user.getWork_status().equals("")){
user.setWork_status("0");
}
-
return R.status(userService.updateUser(user));
}
@@ -237,13 +235,28 @@
@ApiOperation(value = "修改基本信息", notes = "传入User")
public R updateInfo(@Valid @RequestBody User user) {
CacheUtil.clear(USER_CACHE);
- String avatar = user.getAvatar();
- String substring = avatar.substring(25, avatar.length());
- String url="https://web.byisf.com/minio"+substring;
- user.setAvatar(url);
+ if (null!= user.getAvatar() && user.getAvatar()!="") {
+ String avatar = user.getAvatar();
+ String substring = avatar.substring(25, avatar.length());
+ String url = "https://web.byisf.com/minio" + substring;
+ user.setAvatar(url);
+ }
return R.status(userService.updateUserInfo(user));
}
+
+ /**
+ * 修改用户基本信息,不修改用户密码
+ * @param user 用户信息
+ * @autor zhongrj
+ * @time 2021-06-16
+ */
+ @PostMapping("/updateUserInfo")
+ public R updateUserInfo(@Valid @RequestBody User user) {
+ CacheUtil.clear(USER_CACHE);
+ return R.status(userService.updateUserInfos(user));
+ }
+
/**
* 用户列表
*/
--
Gitblit v1.9.3