修改了个人模块几个模块可以共享数据了

feige

2025-06-23 082ba3d3cd975f182425448bcea3a9166b70980b

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

@@ -13,7 +13,9 @@
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.ruoyi.common.annotation.Anonymous;
import com.ruoyi.common.core.domain.entity.sysUserInfo;
import com.ruoyi.common.utils.uuid.UUID;
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 +247,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 +276,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 +291,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 +300,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();
@@ -380,6 +382,19 @@
        infoUser.setNickName(userAll.getNickName());
        infoUser.setOldName(userAll.getUserName());
        infoUser.setPhoneNumber(userAll.getPhonenumber());


        //设置新的usid
//        UUID uuid=        UUID.fromString(userAll.getUserName()+userAll.getPhonenumber());
//        String usid  = uuid.toString();


            String originalString=userAll.getUserName()+"-"+userAll.getPhonenumber();

            String uniqueId = UUID.nameUUIDFromBytes(originalString.getBytes()).toString();
        infoUser.setUaid(uniqueId);


        System.out.println(userAll.getSex());
        System.out.println("性别的原因");

@@ -433,6 +448,7 @@

            }
            MarrySelf marrySelf = new MarrySelf();
            marrySelf.setUid(user.getUserId());
            marrySelf.setName(infoUser.getOldName());
            marrySelf.setSex(infoUser.getSex()==1?"男":"女");
            marrySelf.setMarryStatus(0);