zqy
2024-10-03 5a0f89efcca725abd41381fd74358e47b4ff3909
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
@@ -221,7 +221,7 @@
//                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) {
@@ -229,7 +229,7 @@
                    System.out.println("33333333333333333333333333333333333333333/");
                    infoUser.setFamilyId(spouse.getFamilyId());
                    infoUser.setClanId(spouse.getClanId());
                }
//                }
            }}
        if(infoUser.getFamilyId()!=null)
            zInfoUserService.saveOrUpdate(infoUser);
@@ -242,6 +242,11 @@
            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);
        }
@@ -379,6 +384,10 @@
                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);
            }
        }