继承家庭号&过滤配偶

zqy

2024-06-28 4c1aa5c03b32aaae0f88dfa3ea5dcef3419d4c86

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

@@ -169,6 +169,26 @@
//            infoUser.setFatherId(zfFamily.getFid());
//        if(zfFamily!=null&&zfFamily.getMid()!=null)
//            infoUser.setMomId(zfFamily.getMid());

        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) {
//            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) {
            ZInfoUser zu = new ZInfoUser();
@@ -201,6 +221,7 @@
        user.setSex(userAll.getSex());
        user.setRemark(userAll.getRemark());
        user.setUpdateBy(userAll.getUpdateBy());
//        user.setSex(userAll.getSex()=="男"?"1":"0");
    //    user.setPostIds(userAll.getPostIds());
      //  user.set
        if (!userService.checkUserNameUnique(user))
@@ -228,7 +249,7 @@
        infoUser.setOldName(userAll.getUserName());
        infoUser.setPhoneNumber(userAll.getPhonenumber());
        infoUser.setSex(userAll.getSex()=="男"?1:0);
        infoUser.setFamilyId(userAll.getFid());
//        infoUser.setFamilyId(userAll.getFid());
        infoUser.setSpouseId(userAll.getSpouseId());

        infoUser.setFatherId(userAll.getFid());
@@ -243,8 +264,8 @@
//            infoUser.setFatherId(zfFamily.getMid());
//            //   infoUser.setMomId(zfFamily.getMid());
//        }
        System.out.println("-----");
        System.out.println(userAll.getIsMyFamily());
//        System.out.println("-----");
//        System.out.println(userAll.getIsMyFamily());

        infoUser.setIsMyFamily(userAll.getIsMyFamily());
//        if(userAll.getSpouseId()==0)
@@ -253,6 +274,19 @@
//            infoUser.setSpouseId(userAll.getSpouseId());
//
//        }
        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());
            if (mother.getIsMyFamily() == 1)
                infoUser.setFamilyId(mother.getFamilyId());
        }
//        else {
//            ZInfoUser spouse = zInfoUserService.getById(userAll.getSpouseId());
//            infoUser.setFamilyId(spouse.getFamilyId());
//        }

        //前端保证了角色不为空
     //   if(user.getRoleIds()[0]==102)

@@ -270,6 +304,7 @@
                zInfoUserService.updateById(zu);
            }
        }

        //    zInfoUserService.saveOrUpdate(infoUser);
//            LambdaQueryWrapper<ZInfoUser> lqw = new LambdaQueryWrapper<>();
//            lqw.eq(ZInfoUser::getSpouseId, userAll.getSpouseId());