From b304a41194ab76ee60665960e0bfee0169176387 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Thu, 21 Aug 2025 14:59:10 +0800
Subject: [PATCH] 修复用户归属部门无法修改为空问题
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysProfileController.java | 106 +++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 94 insertions(+), 12 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysProfileController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysProfileController.java
index 56f8fbe..83aab06 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysProfileController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysProfileController.java
@@ -1,17 +1,31 @@
package com.ruoyi.system.controller;
+import java.util.Arrays;
+import java.util.Map;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
+import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.utils.DateUtils;
+import com.ruoyi.common.core.utils.StringUtils;
+import com.ruoyi.common.core.utils.file.FileTypeUtils;
+import com.ruoyi.common.core.utils.file.MimeTypeUtils;
import com.ruoyi.common.core.web.controller.BaseController;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.log.annotation.Log;
import com.ruoyi.common.log.enums.BusinessType;
+import com.ruoyi.common.security.service.TokenService;
import com.ruoyi.common.security.utils.SecurityUtils;
+import com.ruoyi.system.api.RemoteFileService;
+import com.ruoyi.system.api.domain.SysFile;
import com.ruoyi.system.api.domain.SysUser;
+import com.ruoyi.system.api.model.LoginUser;
import com.ruoyi.system.service.ISysUserService;
/**
@@ -25,6 +39,12 @@
{
@Autowired
private ISysUserService userService;
+
+ @Autowired
+ private TokenService tokenService;
+
+ @Autowired
+ private RemoteFileService remoteFileService;
/**
* 个人信息
@@ -47,11 +67,27 @@
@PutMapping
public AjaxResult updateProfile(@RequestBody SysUser user)
{
- if (userService.updateUserProfile(user) > 0)
+ LoginUser loginUser = SecurityUtils.getLoginUser();
+ SysUser currentUser = loginUser.getSysUser();
+ currentUser.setNickName(user.getNickName());
+ currentUser.setEmail(user.getEmail());
+ currentUser.setPhonenumber(user.getPhonenumber());
+ currentUser.setSex(user.getSex());
+ if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(currentUser))
{
- return AjaxResult.success();
+ return error("修改用户'" + loginUser.getUsername() + "'失败，手机号码已存在");
}
- return AjaxResult.error("修改个人信息异常，请联系管理员");
+ if (StringUtils.isNotEmpty(user.getEmail()) && !userService.checkEmailUnique(currentUser))
+ {
+ return error("修改用户'" + loginUser.getUsername() + "'失败，邮箱账号已存在");
+ }
+ if (userService.updateUserProfile(currentUser))
+ {
+ // 更新缓存用户信息
+ tokenService.setLoginUser(loginUser);
+ return success();
+ }
+ return error("修改个人信息异常，请联系管理员");
}
/**
@@ -59,23 +95,69 @@
*/
@Log(title = "个人信息", businessType = BusinessType.UPDATE)
@PutMapping("/updatePwd")
- public AjaxResult updatePwd(String oldPassword, String newPassword)
+ public AjaxResult updatePwd(@RequestBody Map<String, String> params)
{
- String username = SecurityUtils.getUsername();
- SysUser user = userService.selectUserByUserName(username);
- String password = user.getPassword();
+ String oldPassword = params.get("oldPassword");
+ String newPassword = params.get("newPassword");
+ LoginUser loginUser = SecurityUtils.getLoginUser();
+ Long userId = loginUser.getUserid();
+ String password = loginUser.getSysUser().getPassword();
if (!SecurityUtils.matchesPassword(oldPassword, password))
{
- return AjaxResult.error("修改密码失败，旧密码错误");
+ return error("修改密码失败，旧密码错误");
}
if (SecurityUtils.matchesPassword(newPassword, password))
{
- return AjaxResult.error("新密码不能与旧密码相同");
+ return error("新密码不能与旧密码相同");
}
- if (userService.resetUserPwd(username, SecurityUtils.encryptPassword(newPassword)) > 0)
+ newPassword = SecurityUtils.encryptPassword(newPassword);
+ if (userService.resetUserPwd(userId, newPassword) > 0)
{
- return AjaxResult.success();
+ // 更新缓存用户密码&密码最后更新时间
+ loginUser.getSysUser().setPwdUpdateDate(DateUtils.getNowDate());
+ loginUser.getSysUser().setPassword(newPassword);
+ tokenService.setLoginUser(loginUser);
+ return success();
}
- return AjaxResult.error("修改密码异常，请联系管理员");
+ return error("修改密码异常，请联系管理员");
+ }
+
+ /**
+ * 头像上传
+ */
+ @Log(title = "用户头像", businessType = BusinessType.UPDATE)
+ @PostMapping("/avatar")
+ public AjaxResult avatar(@RequestParam("avatarfile") MultipartFile file)
+ {
+ if (!file.isEmpty())
+ {
+ LoginUser loginUser = SecurityUtils.getLoginUser();
+ String extension = FileTypeUtils.getExtension(file);
+ if (!StringUtils.equalsAnyIgnoreCase(extension, MimeTypeUtils.IMAGE_EXTENSION))
+ {
+ return error("文件格式不正确，请上传" + Arrays.toString(MimeTypeUtils.IMAGE_EXTENSION) + "格式");
+ }
+ R<SysFile> fileResult = remoteFileService.upload(file);
+ if (StringUtils.isNull(fileResult) || StringUtils.isNull(fileResult.getData()))
+ {
+ return error("文件服务异常，请联系管理员");
+ }
+ String url = fileResult.getData().getUrl();
+ if (userService.updateUserAvatar(loginUser.getUserid(), url))
+ {
+ String oldAvatarUrl = loginUser.getSysUser().getAvatar();
+ if (StringUtils.isNotEmpty(oldAvatarUrl))
+ {
+ remoteFileService.delete(oldAvatarUrl);
+ }
+ AjaxResult ajax = AjaxResult.success();
+ ajax.put("imgUrl", url);
+ // 更新缓存用户头像
+ loginUser.getSysUser().setAvatar(url);
+ tokenService.setLoginUser(loginUser);
+ return ajax;
+ }
+ }
+ return error("上传图片异常，请联系管理员");
}
}
--
Gitblit v1.9.3