zqy
2025-05-30 f769e7c35bd1f8deb4f587ee9b019d633cecf8d6
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
@@ -214,7 +214,8 @@
//            infoUser.setFatherId(zfFamily.getFid());
//        if(zfFamily!=null&&zfFamily.getMid()!=null)
//            infoUser.setMomId(zfFamily.getMid());
            Long myFamily = zInfoUserService.getById(user).getFamilyId();
        if (myFamily != null) infoUser.setFamilyId(myFamily);
            if (user.getFid() != null){
            //跟随父亲的家族和家庭信息
          //   if (!zInfoUserService.getById(user.getUserId()).getFatherId().equals(user.getFid())){
@@ -252,8 +253,10 @@
                    ZInfoUser spouse = zInfoUserService.getById(user.getSpouseId());
                    System.out.println("33333333333333333333333333333333333333333/");
                    infoUser.setFamilyId(spouse.getFamilyId());
                    infoUser.setFatherId(spouse.getFatherId());
                    infoUser.setMomId(spouse.getMomId());
                    if(spouse.getFatherId() !=null || spouse.getMomId() !=null) {
                        infoUser.setFatherId(spouse.getFatherId());
                        infoUser.setMomId(spouse.getMomId());
                    }
                    infoUser.setClanId(spouse.getClanId());
//                }
@@ -261,7 +264,7 @@
        }
        if(infoUser.getIsMyFamily() == 1)
        if(infoUser.getFamilyId() != null)
            zInfoUserService.saveOrUpdate(infoUser);
        else {
            System.out.println("家庭成员不能修改为普通用户");