无关风月
2024-12-31 52461f1688e83970d4aa3aa6b835bdf7719f5769
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
@@ -49,6 +49,22 @@
    @Autowired
    private ISysPermissionService permissionService;
    /**
     * 删除用户
     */
    @PostMapping("/getSysUserByPhonenumber/{phonenumber}")
    @ApiOperation("根据手机号获取账号")
    public R<SysUser> getSysUserByPhonenumber(@PathVariable("phonenumber") String phonenumber) {
        SysUser one = userService.getOne(new QueryWrapper<SysUser>()
                .eq("phonenumber", phonenumber).eq("del_flag", 0));
        return R.ok(one);
    }
    @PostMapping("/updatePassword1")
    @ApiOperation("账号管理--账号详情")
    public R<SysUser> updatePassword1(@RequestBody SysUser sysUser) {
        userService.updateUser(sysUser);
        return R.ok(sysUser);
    }
    /**
     * 获取当前用户信息
     */
    @InnerAuth
@@ -178,17 +194,19 @@
        user.setNickName(nickName);
        user.setDeptId(deptId);
        user.setPhonenumber(phonenumber);
        SysUser byId = userService.getById(dto.getUserId());
        if (!byId.getPhonenumber().equals(phonenumber)){
            if (StringUtils.isNotEmpty(dto.getPhonenumber()) && !userService.checkPhoneUnique(user)) {
                return error("手机号已存在,请重新输入");
            }
        user.setUserId(dto.getUserId());
        List<SysUser> list = userService.list(new QueryWrapper<SysUser>()
                .eq("del_flag", 0)
                .ne("user_id",dto.getUserId())
                .eq("phonenumber", dto.getPhonenumber()));
        if (!list.isEmpty()){
            return error("手机号已存在,请重新输入");
        }
        user.setUserName(user.getPhonenumber());
        if(!org.springframework.util.StringUtils.hasLength(user.getNickName())){
            user.setNickName(user.getPhonenumber());
        }
        user.setPassword(SecurityUtils.encryptPassword("a123456"));
//        user.setPassword(SecurityUtils.encryptPassword("a123456"));
        user.setRoleType(1);
        user.setUpdateBy(SecurityUtils.getUsername());
        user.setUpdateTime(new Date());