zqy
2025-07-31 bc2f38a3e86de8e19b73a4bead3c81703678ad2f
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
@@ -243,6 +243,8 @@
            }
            // 2.2.3 配偶家族继承(最高优先级)
            if (user.getSpouseId() != null ){
                //将修改的对应用户原本id清空
                zInfoUserService.setSpouseOnly(user.getUserId());
                // 仅当用户首次成为家庭成员时继承配偶家族
                if (zInfoUserService.getById(user.getUserId()) == null ||
                        zInfoUserService.getById(user.getUserId()).getIsMyFamily() == 0) {
@@ -288,7 +290,6 @@
            }
            // ===== 3. 婚姻状态专项处理 =====
            if(infoUser.getMaritalStatus() != null) {
                // 3.1 构建本人婚姻信息
                MarryInfoDto marrySelf = new MarryInfoDto();
                marrySelf.setUid(user.getSysId()); // 系统ID
@@ -345,7 +346,7 @@
                    exSpouseRecord.setMarryStatus(2);          // 离婚状态
                    marryUserService.save(exSpouseRecord);     // 写入历史表
                }
            }
            return AjaxResult.success(); // 操作成功
        } else {
            // ⚠️ 非家庭成员直接阻断