feige
2024-06-22 1250a22d42e2cd89c11e38aa2ff45ce00f7aaba0
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
@@ -160,14 +160,21 @@
        infoUser.setFatherId(user.getFid());
//        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());
        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();
@@ -222,6 +229,7 @@
        infoUser.setSex(userAll.getSex()=="男"?1:0);
        infoUser.setFamilyId(userAll.getFid());
        infoUser.setSpouseId(userAll.getSpouseId());
        infoUser.setFatherId(userAll.getFid());
        infoUser.setMomId(userAll.getMid());
     //   infoUser.setFamilyId(userAll.getFamilyId());
@@ -253,6 +261,13 @@
        if(userAll.getRoleId()==102) {
            infoUser.setRoleId(3L);
            zInfoUserService.save(infoUser);
            if(userAll.getSpouseId()!=null)
            {
                ZInfoUser zu = new ZInfoUser();
                zu.setUserId(userAll.getSpouseId());
                zu.setSpouseId(infoUser.getUserId());
                zInfoUserService.updateById(zu);
            }
        }
        //    zInfoUserService.saveOrUpdate(infoUser);
//            LambdaQueryWrapper<ZInfoUser> lqw = new LambdaQueryWrapper<>();