新增祖先 密码没有加密

zqy

2025-06-03 90dae453c4b276b609e596bd76f5e757287de978

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

@@ -214,8 +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);
            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())){
@@ -253,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());

//                }
@@ -273,6 +275,8 @@
            ZInfoUser zu = new ZInfoUser();
            zu.setUserId(user.getSpouseId());
            zu.setSpouseId(infoUser.getUserId());
            zu.setFatherId(infoUser.getFatherId());
            zu.setMomId(infoUser.getMomId());
//            Long spouseMoM = zInfoUserService.getById(user.getSpouseId()).getMomId();
//            Long spouseDad = zInfoUserService.getById(user.getSpouseId()).getFatherId();
//            zu.setMomId(spouseMoM);