| | |
| | | infoUser.setNickName(userAll.getNickName()); |
| | | infoUser.setOldName(userAll.getUserName()); |
| | | infoUser.setPhoneNumber(userAll.getPhonenumber()); |
| | | infoUser.setSex(userAll.getSex()=="男"?1:0); |
| | | System.out.println(userAll.getSex()); |
| | | System.out.println("性别的原因"); |
| | | |
| | | infoUser.setSex(userAll.getSex().equals("0")?0:1); |
| | | System.out.println(infoUser.getSex()); |
| | | // infoUser.setFamilyId(userAll.getFid()); |
| | | infoUser.setSpouseId(userAll.getSpouseId()); |
| | | |
| | |
| | | { |
| | | 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)) |
| | | { |