优化无用户编号不校验数据权限

RuoYi

2024-11-05 632b959324ddaa754b8c7aa88f38ec3c994e60f5

 src/main/java/com/ruoyi/project/system/controller/SysProfileController.java

@@ -9,7 +9,6 @@
import org.springframework.web.bind.annotation.RequestParam;

import org.springframework.web.bind.annotation.RestController;

import org.springframework.web.multipart.MultipartFile;

import com.ruoyi.common.constant.UserConstants;

import com.ruoyi.common.utils.SecurityUtils;

import com.ruoyi.common.utils.StringUtils;

import com.ruoyi.common.utils.file.FileUploadUtils;

@@ -61,29 +60,22 @@
    public AjaxResult updateProfile(@RequestBody SysUser user)

    {

        LoginUser loginUser = getLoginUser();

        SysUser sysUser = loginUser.getUser();

        user.setUserName(sysUser.getUserName());

        if (StringUtils.isNotEmpty(user.getPhonenumber())

                && UserConstants.NOT_UNIQUE.equals(userService.checkPhoneUnique(user)))

        SysUser currentUser = loginUser.getUser();

        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 error("修改用户'" + user.getUserName() + "'失败，手机号码已存在");

            return error("修改用户'" + loginUser.getUsername() + "'失败，手机号码已存在");

        }

        if (StringUtils.isNotEmpty(user.getEmail())

                && UserConstants.NOT_UNIQUE.equals(userService.checkEmailUnique(user)))

        if (StringUtils.isNotEmpty(user.getEmail()) && !userService.checkEmailUnique(currentUser))

        {

            return error("修改用户'" + user.getUserName() + "'失败，邮箱账号已存在");

            return error("修改用户'" + loginUser.getUsername() + "'失败，邮箱账号已存在");

        }

        user.setUserId(sysUser.getUserId());

        user.setPassword(null);

        user.setAvatar(null);

        user.setDeptId(null);

        if (userService.updateUserProfile(user) > 0)

        if (userService.updateUserProfile(currentUser) > 0)

        {

            // 更新缓存用户信息

            sysUser.setNickName(user.getNickName());

            sysUser.setPhonenumber(user.getPhonenumber());

            sysUser.setEmail(user.getEmail());

            sysUser.setSex(user.getSex());

            tokenService.setLoginUser(loginUser);

            return success();

        }

@@ -108,10 +100,11 @@
        {

            return error("新密码不能与旧密码相同");

        }

        if (userService.resetUserPwd(userName, SecurityUtils.encryptPassword(newPassword)) > 0)

        newPassword = SecurityUtils.encryptPassword(newPassword);

        if (userService.resetUserPwd(userName, newPassword) > 0)

        {

            // 更新缓存用户密码

            loginUser.getUser().setPassword(SecurityUtils.encryptPassword(newPassword));

            loginUser.getUser().setPassword(newPassword);

            tokenService.setLoginUser(loginUser);

            return success();

        }