| | |
| | | // infoUser.setFamilyId(mother.getFamilyId()); |
| | | // } |
| | | if (user.getSpouseId() != null){ |
| | | if ( !zInfoUserService.getById(user.getUserId()).getSpouseId().equals(user.getSpouseId())){ |
| | | // if ( !zInfoUserService.getById(user.getUserId()).getSpouseId().equals(user.getSpouseId())){ |
| | | |
| | | //是本家 |
| | | if (zInfoUserService.getById(user.getUserId()).getIsMyFamily() == 0) { |
| | |
| | | System.out.println("33333333333333333333333333333333333333333/"); |
| | | infoUser.setFamilyId(spouse.getFamilyId()); |
| | | infoUser.setClanId(spouse.getClanId()); |
| | | } |
| | | // } |
| | | }} |
| | | if(infoUser.getFamilyId()!=null) |
| | | zInfoUserService.saveOrUpdate(infoUser); |
| | |
| | | ZInfoUser zu = new ZInfoUser(); |
| | | zu.setUserId(user.getSpouseId()); |
| | | zu.setSpouseId(infoUser.getUserId()); |
| | | Long spouseMoM = zInfoUserService.getById(user.getSpouseId()).getMomId(); |
| | | Long spouseDad = zInfoUserService.getById(user.getSpouseId()).getFatherId(); |
| | | zu.setMomId(spouseMoM); |
| | | zu.setFatherId(spouseDad); |
| | | |
| | | zInfoUserService.updateById(zu); |
| | | } |
| | | |
| | |
| | | ZInfoUser zu = new ZInfoUser(); |
| | | zu.setUserId(userAll.getSpouseId()); |
| | | zu.setSpouseId(infoUser.getUserId()); |
| | | Long spouseMoM = zInfoUserService.getById(userAll.getSpouseId()).getMomId(); |
| | | Long spouseDad = zInfoUserService.getById(userAll.getSpouseId()).getFatherId(); |
| | | zu.setMomId(spouseMoM); |
| | | zu.setFatherId(spouseDad); |
| | | zInfoUserService.updateById(zu); |
| | | } |
| | | } |
| | |
| | | @PutMapping("/resetPwd") |
| | | public AjaxResult resetPwd(@RequestBody SysUser user) |
| | | { |
| | | userService.checkUserAllowed(user); |
| | | userService.checkUserDataScope(user.getUserId()); |
| | | // userService.checkUserAllowed(user); |
| | | // userService.checkUserDataScope(user.getUserId()); |
| | | user.setPassword(SecurityUtils.encryptPassword(user.getPassword())); |
| | | user.setUpdateBy(getUsername()); |
| | | return toAjax(userService.resetPwd(user)); |