feige
2024-08-30 3ce299ce3e9db1342b519dd8d8b9062c7f99eeea
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
@@ -286,7 +286,7 @@
        infoUser.setNickName(userAll.getNickName());
        infoUser.setOldName(userAll.getUserName());
        infoUser.setPhoneNumber(userAll.getPhonenumber());
        infoUser.setSex(userAll.getSex()=="男"?1:0);
        infoUser.setSex(userAll.getSex()=="0"?0:1);
//        infoUser.setFamilyId(userAll.getFid());
        infoUser.setSpouseId(userAll.getSpouseId());
@@ -380,9 +380,9 @@
    {
        userService.checkUserAllowed(user);
        userService.checkUserDataScope(user.getUserId());
        if (!userService.checkUserNameUnique(user))
        if (!userService.checkNickNameUnique(user))
        {
            return error("修改用户'" + user.getUserName() + "'失败,登录账号已存在");
            return error("修改用户'" + user.getNickName() + "'失败,登录账号已存在");
        }
        else if (StringUtils.isNotEmpty(user.getPhonenumber()) && !userService.checkPhoneUnique(user))
        {