家族

zqy

2024-07-25 c8a96c5e4ce5d5013a5ec508e2422f40ecdc311e

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

@@ -148,26 +148,61 @@
        us.setRoleId(user.getRoleId());
        us.setSex(user.getSex());
        us.setStatus(user.getStatus());
        us.setRemark(user.getRemark());
        userService.updateUser(us);

  //      System.out.println(user.getFamilyId());
     //   System.out.println("[[[[]]]]]]");
                ZInfoUser infoUser = new ZInfoUser();
        ZInfoUser infoUser = new ZInfoUser();
        infoUser.setUserId(user.getUserId());
        infoUser.setOldName(user.getUserName());
        infoUser.setNickName(user.getNickName());
        infoUser.setIsMyFamily(user.getIsMyFamily());
        infoUser.setMomId(user.getMid());
        infoUser.setFatherId(user.getFid());
        infoUser.setSex(Integer.valueOf(user.getSex()));
//        infoUser.setFamilyId(user.getFamilyId());
        infoUser.setSysId(user.getSysId());
        if(user.getSpouseId()!=null)
        if(user.getSpouseId()!=null) {
            infoUser.setSpouseId(user.getSpouseId());
        }
//        ZfFamily zfFamily = zfFamilyService.getByFamId(user.getFamilyId());
//        if(zfFamily!=null&&zfFamily.getFid()!=null)
//            infoUser.setFatherId(zfFamily.getFid());
//        if(zfFamily!=null&&zfFamily.getMid()!=null)
//            infoUser.setMomId(zfFamily.getMid());


        if (!zInfoUserService.getById(user.getUserId()).getFatherId().equals(user.getFid())){
            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());
//            }
            if ( !zInfoUserService.getById(user.getUserId()).getSpouseId().equals(user.getSpouseId())){
                if (zInfoUserService.getById(user.getUserId()).getIsMyFamily() == 0) {
                    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();
            zu.setUserId(user.getSpouseId());
            zu.setSpouseId(infoUser.getUserId());
            zInfoUserService.updateById(zu);
        }
      //  zInfoUserService.update(infoUser);
             //   .saveOrUpdate(infoUser);
        return AjaxResult.success();
@@ -193,6 +228,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))
@@ -220,7 +256,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());
@@ -235,8 +271,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)
@@ -245,6 +281,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());
            else if (mother.getIsMyFamily() == 1)
                infoUser.setFamilyId(mother.getFamilyId());
        }
        else {
            ZInfoUser spouse = zInfoUserService.getById(userAll.getSpouseId());
            infoUser.setFamilyId(spouse.getFamilyId());
        }

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

@@ -262,6 +311,7 @@
                zInfoUserService.updateById(zu);
            }
        }

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