修改婚姻bug && 管理员修改用户信息时 同步修改用户姓名、性别、婚姻状态

zqy

8 天以前 1496a2640408f000f31e01ebe90b5ef97237f5a1

修改婚姻bug && 管理员修改用户信息时 同步修改用户姓名、性别、婚姻状态

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

@@ -223,6 +223,18 @@
            // 优先获取当前数据库记录
            ZInfoUser byId = zInfoUserService.getById(user);
            Long myFamily = byId.getFamilyId();

            //获取同一用户的信息 并对其进行修改
            zInfoUserService.findByUaidToFaid(byId.getUaid())
                    .stream()
                    .filter(infoUser1 -> !infoUser1.getUserId().equals(infoUser.getUserId()))
                    .forEach(infoUser1 -> {
                        infoUser1.setOldName(infoUser.getOldName());
                        infoUser1.setMaritalStatus(infoUser.getMaritalStatus());
                        infoUser1.setSex(infoUser.getSex());
                        zInfoUserService.updateById(infoUser1);
                    });

            // 保留原家庭ID（确保数据连续性）
            if (myFamily != null) infoUser.setFamilyId(myFamily);

@@ -318,7 +330,10 @@
                    marrySelfService.updateData(spouse); // 持久化
                }

                // 3.4 离婚特殊处理（状态码=2）



            // 3.4 离婚特殊处理（状态码=2）
                if(user.getMaritalStatus() != null && user.getMaritalStatus() == 2) {
                    // 3.4.1 获取配偶信息
                    Long spouseId = zInfoUserService.getById(user.getUserId()).getSpouseId();

 zhang-content/src/main/java/com/ruoyi/service/impl/MarrySelfServiceImpl.java

@@ -67,6 +67,7 @@
        //拿到所有的sysid
        List<Long> fms = zInfoUserService.findByUaidToFaid(zInfoUser.getUaid()).stream().map(ZInfoUser::getSysId).collect(Collectors.toList());

        fms.add(zInfoUser.getSysId());

        marryUserLQW.in(MarryUser::getUid, fms);
      //  marryUserLQW.eq(MarryUser::getUid,userId);