zqy
2024-07-25 c8a96c5e4ce5d5013a5ec508e2422f40ecdc311e
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
@@ -172,24 +172,29 @@
//        if(zfFamily!=null&&zfFamily.getMid()!=null)
//            infoUser.setMomId(zfFamily.getMid());
        if (!zInfoUserService.getById(user.getUserId()).getFatherId().equals(user.getFid())){
        if (user.getFid() != null){
            ZInfoUser father = zInfoUserService.getById(user.getFid());
            if (father.getIsMyFamily() == 1)
                System.out.println("11111111111111111111111111111111/");
                infoUser.setFamilyId(father.getFamilyId());
        }
        else if(user.getMid() != null){
            ZInfoUser mother = zInfoUserService.getById(user.getMid());
            if (mother.getIsMyFamily() == 1)
                System.out.println("2222222222222222222222222222222222/");
            infoUser.setFamilyId(mother.getFamilyId());
        }
        else if (user.getSpouseId()!=null) {
//            else if(user.getMid() != null){
//                ZInfoUser mother = zInfoUserService.getById(user.getMid());
//                if (mother.getIsMyFamily() == 1)
//                    System.out.println("2222222222222222222222222222222222/");
//                infoUser.setFamilyId(mother.getFamilyId());
//            }
            if ( !zInfoUserService.getById(user.getUserId()).getSpouseId().equals(user.getSpouseId())){
                if (zInfoUserService.getById(user.getUserId()).getIsMyFamily() == 0) {
            ZInfoUser spouse = zInfoUserService.getById(user.getSpouseId());
            System.out.println("33333333333333333333333333333333333333333/");
            infoUser.setFamilyId(spouse.getFamilyId());
            infoUser.setSpouseId(user.getSpouseId());
        }
            }
        zInfoUserService.saveOrUpdate(infoUser);
        if(user.getSpouseId()!=null) {