修改婚姻bug

zqy

2025-06-10 b81f959f7d8180cb26a2879265a1183742609383

修改婚姻bug

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

@@ -14,6 +14,7 @@
import com.ruoyi.common.annotation.Anonymous;
import com.ruoyi.common.core.domain.entity.sysUserInfo;
import com.ruoyi.domain.*;
import com.ruoyi.domain.dto.MarryInfoDto;
import com.ruoyi.service.*;
import com.ruoyi.system.domain.SysUserRole;
import com.ruoyi.system.mapper.SysRoleMapper;
@@ -245,7 +246,7 @@
//            }
            System.out.println("{{{{{{{{{{{{{{{"+user);

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

            //跟随配偶的家族和家庭信息
//            if ( !zInfoUserService.getById(user.getUserId()).getSpouseId().equals(user.getSpouseId())){
@@ -274,7 +275,7 @@
            return AjaxResult.error("家庭成员不能修改为普通用户");
        }
        //更新配偶信息
        if(user.getSpouseId() != null && !byId.getSpouseId().equals(user.getSpouseId())) {
        if(user.getSpouseId() != null) {
            ZInfoUser zu = new ZInfoUser();
            zu.setUserId(user.getSpouseId());
            zu.setSpouseId(infoUser.getUserId());
@@ -289,7 +290,7 @@

            //更新MarrySelf和MarryUser
            ZInfoUser zfi = zInfoUserService.getById(user.getUserId());
            MarrySelf marrySelf = new MarrySelf();
            MarryInfoDto marrySelf = new MarryInfoDto();
            marrySelf.setUid(user.getSpouseId());
            marrySelf.setName(zfi.getOldName());
            marrySelf.setSpouseSex(zfi.getSex()==1?"男":"女");
@@ -298,7 +299,7 @@
            marrySelf.setSpouseName(infoUser.getOldName());
            marrySelf.setSpouseSex(infoUser.getSex()==1?"男":"女");
            marrySelf.setSpouseMarryStatus(0);
            marrySelfService.saveOrUpdate(marrySelf);
            marrySelfService.updateData(marrySelf);
            //增加MarryUser
            //增加marryUser
            MarryUser marryUser = new MarryUser();

 zhang-content/src/main/java/com/ruoyi/domain/dto/MarryInfoDto.java

@@ -92,6 +92,8 @@
    @Excel(name = "配偶户籍地址")
    private String spouseAddress;

    private Long uid;

//    //配偶的数据
//    private Long spouseId;
//    //    @ExcelProperty(value = {"配偶信息","姓名"})