修改婚姻bug

zqy

2025-06-10 e629bce5164adc765780301114f95a60140eadd7

修改婚姻bug

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

@@ -214,7 +214,8 @@
//            infoUser.setFatherId(zfFamily.getFid());
//        if(zfFamily!=null&&zfFamily.getMid()!=null)
//            infoUser.setMomId(zfFamily.getMid());
            Long myFamily = zInfoUserService.getById(user).getFamilyId();
            ZInfoUser byId = zInfoUserService.getById(user);
            Long myFamily = byId.getFamilyId();
        if (myFamily != null) infoUser.setFamilyId(myFamily);
            if (user.getFid() != null){
            //跟随父亲的家族和家庭信息
@@ -242,7 +243,9 @@
//                    System.out.println("2222222222222222222222222222222222/");
//                infoUser.setFamilyId(mother.getFamilyId());
//            }
        if (user.getSpouseId() != null){
            System.out.println("{{{{{{{{{{{{{{{"+user);

        if (user.getSpouseId() != null && !byId.getSpouseId().equals(user.getSpouseId())){

            //跟随配偶的家族和家庭信息
//            if ( !zInfoUserService.getById(user.getUserId()).getSpouseId().equals(user.getSpouseId())){
@@ -264,14 +267,14 @@


        }
        if(infoUser.getFamilyId() != null)
        if(infoUser.getFamilyId() != null )
            zInfoUserService.saveOrUpdate(infoUser);
        else {
            System.out.println("家庭成员不能修改为普通用户");
            return AjaxResult.error("家庭成员不能修改为普通用户");
        }
        //更新配偶信息
        if(user.getSpouseId()!=null) {
        if(user.getSpouseId() != null && !byId.getSpouseId().equals(user.getSpouseId())) {
            ZInfoUser zu = new ZInfoUser();
            zu.setUserId(user.getSpouseId());
            zu.setSpouseId(infoUser.getUserId());