Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev

疯狂的狮子li

2021-07-27 06944747fd52b98f21337274678325ff62d10beb

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java

@@ -19,10 +19,12 @@
import org.springframework.web.multipart.MultipartFile;

import java.io.IOException;
import java.util.HashMap;
import java.util.Map;

/**
 * 个人信息 业务处理
 * 
 *
 * @author ruoyi
 */
@RestController
@@ -43,10 +45,11 @@
    {
        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
        SysUser user = loginUser.getUser();
        AjaxResult ajax = AjaxResult.success(user);
      Map<String,Object> ajax = new HashMap<>();
      ajax.put("user", user);
        ajax.put("roleGroup", userService.selectUserRoleGroup(loginUser.getUsername()));
        ajax.put("postGroup", userService.selectUserPostGroup(loginUser.getUsername()));
        return ajax;
        return AjaxResult.success(ajax);
    }

    /**
@@ -66,9 +69,12 @@
        {
            return AjaxResult.error("修改用户'" + user.getUserName() + "'失败，邮箱账号已存在");
        }
        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
        SysUser sysUser = loginUser.getUser();
        user.setUserId(sysUser.getUserId());
        user.setPassword(null);
        if (userService.updateUserProfile(user) > 0)
        {
            LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
            // 更新缓存用户信息
            loginUser.getUser().setNickName(user.getNickName());
            loginUser.getUser().setPhonenumber(user.getPhonenumber());
@@ -121,12 +127,12 @@
            String avatar = FileUploadUtils.upload(RuoYiConfig.getAvatarPath(), file);
            if (userService.updateUserAvatar(loginUser.getUsername(), avatar))
            {
                AjaxResult ajax = AjaxResult.success();
            Map<String,Object> ajax = new HashMap<>();
                ajax.put("imgUrl", avatar);
                // 更新缓存用户头像
                loginUser.getUser().setAvatar(avatar);
                tokenService.setLoginUser(loginUser);
                return ajax;
                return AjaxResult.success(ajax);
            }
        }
        return AjaxResult.error("上传图片异常，请联系管理员");