From a98712ad3dabd5a33674e635238e16041bc58918 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Sat, 19 Jun 2021 14:50:42 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/jfptht-publicSecurity
---
blade-service/blade-user/src/main/java/org/springblade/system/user/controller/UserController.java | 27 +++++++++++++++++++++------
1 files changed, 21 insertions(+), 6 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 3409c13..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
@@ -170,10 +170,10 @@
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");
}
@@ -235,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