zqy
2024-07-15 e0bf75fedccd21ae9f91e9a5e6a4934dc8a269dd
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
@@ -183,12 +183,12 @@
                System.out.println("2222222222222222222222222222222222/");
            infoUser.setFamilyId(mother.getFamilyId());
        }
//        else if (user.getSpouseId()!=null) {
//            ZInfoUser spouse = zInfoUserService.getById(user.getSpouseId());
//            System.out.println("33333333333333333333333333333333333333333/");
//            infoUser.setFamilyId(spouse.getFamilyId());
//            infoUser.setSpouseId(user.getSpouseId());
//        }
        else if (user.getSpouseId()!=null) {
            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) {
@@ -280,13 +280,13 @@
            ZInfoUser mother = zInfoUserService.getById(userAll.getMid());
            if (father.getIsMyFamily() == 1)
                infoUser.setFamilyId(father.getFamilyId());
            if (mother.getIsMyFamily() == 1)
            else if (mother.getIsMyFamily() == 1)
                infoUser.setFamilyId(mother.getFamilyId());
        }
//        else {
//            ZInfoUser spouse = zInfoUserService.getById(userAll.getSpouseId());
//            infoUser.setFamilyId(spouse.getFamilyId());
//        }
        else {
            ZInfoUser spouse = zInfoUserService.getById(userAll.getSpouseId());
            infoUser.setFamilyId(spouse.getFamilyId());
        }
        //前端保证了角色不为空
     //   if(user.getRoleIds()[0]==102)