修改了bug

feige

2024-10-25 81995abfa712d65b7f7f1e23b97a97bc4065103d

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java

@@ -344,6 +344,13 @@
//        System.out.println(userAll.getIsMyFamily());

        infoUser.setIsMyFamily(userAll.getIsMyFamily());
        if(userAll.getIsMyFamily()==1)
        {
            ZfFamily zfFamily = new ZfFamily();
            zfFamily.setName(userAll.getNickName()+"的家庭");
            zfFamilyService.addFamily(zfFamily);
            infoUser.setFamilyId(zfFamily.getId());
        }
//        if(userAll.getSpouseId()==0)
//            infoUser.setSpouseId(null);
//        else {
@@ -353,12 +360,13 @@
        if (userAll.getFid() != null && userAll.getMid() != null){
            ZInfoUser father = zInfoUserService.getById(userAll.getFid());
            ZInfoUser mother = zInfoUserService.getById(userAll.getMid());
            //如果是本家，就简历一个家庭号
            if (father.getIsMyFamily() == 1){
                infoUser.setFamilyId(father.getFamilyId());
           //     infoUser.setFamilyId(father.getFamilyId());
                infoUser.setClanId(father.getClanId());
            }
            else if (mother.getIsMyFamily() == 1){
                infoUser.setFamilyId(mother.getFamilyId());
             //   infoUser.setFamilyId(mother.getFamilyId());
                infoUser.setClanId(mother.getClanId());

        }