xuhy
2025-07-23 7834ca58d2ac1d9a3ba85f20ca03a8c902d0d6a9
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
@@ -11,7 +11,6 @@
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.CodeGenerateUtils;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.framework.web.service.TokenService;
@@ -87,7 +86,6 @@
        SysUser sysUser = userService.selectUserById(userId);
        SysUserVO sysUserVO = new SysUserVO();
        BeanUtils.copyProperties(sysUser,sysUserVO);
        return AjaxResult.success(sysUser);
    }
@@ -161,9 +159,7 @@
            return R.fail("新增用户'" + user.getUserName() + "'失败,手机号码已存在");
        }
        user.setCreateBy(getUsername());
        user.setPassword(SecurityUtils.encryptPassword("123456"));
        user.setRoleType(Integer.parseInt(user.getRoleId().toString()));
        user.setUserIdentification(CodeGenerateUtils.generateVolumeSn());
        user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
        userService.insertUser(user);
        return R.ok();
    }
@@ -193,7 +189,6 @@
        if(StringUtils.isNotEmpty(user.getPassword())){
            user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
        }
        user.setRoleType(Integer.parseInt(user.getRoleId().toString()));
        return R.ok(userService.updateUser(user));
    }
@@ -253,9 +248,9 @@
        user.setOperatingTime(LocalDateTime.now());
        user.setOperatingPerson(sysUser.getNickName()+"("+sysUser.getUserName()+")");
        if(dto.getStatus()==1){
            redisCache.deleteObject(tokenService.getTokenKey(loginUser.getToken()));
        }
//        if(dto.getStatus()==1){
//            redisCache.deleteObject(tokenService.getTokenKey(loginUser.getToken()));
//        }
        return AjaxResult.success(userService.updateUserStatus(user));
    }