修改用户信息时父母会消失&新增查找别的家族成员接口

zqy

2024-10-03 5a0f89efcca725abd41381fd74358e47b4ff3909

修改用户信息时父母会消失&新增查找别的家族成员接口

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

@@ -221,7 +221,7 @@
//                infoUser.setFamilyId(mother.getFamilyId());
//            }
        if (user.getSpouseId() != null){
            if ( !zInfoUserService.getById(user.getUserId()).getSpouseId().equals(user.getSpouseId())){
//            if ( !zInfoUserService.getById(user.getUserId()).getSpouseId().equals(user.getSpouseId())){

                //是本家
                if (zInfoUserService.getById(user.getUserId()).getIsMyFamily() == 0) {
@@ -229,7 +229,7 @@
                    System.out.println("33333333333333333333333333333333333333333/");
                    infoUser.setFamilyId(spouse.getFamilyId());
                    infoUser.setClanId(spouse.getClanId());
                }
//                }
            }}
        if(infoUser.getFamilyId()!=null)
            zInfoUserService.saveOrUpdate(infoUser);
@@ -242,6 +242,11 @@
            ZInfoUser zu = new ZInfoUser();
            zu.setUserId(user.getSpouseId());
            zu.setSpouseId(infoUser.getUserId());
            Long spouseMoM = zInfoUserService.getById(user.getSpouseId()).getMomId();
            Long spouseDad = zInfoUserService.getById(user.getSpouseId()).getFatherId();
            zu.setMomId(spouseMoM);
            zu.setFatherId(spouseDad);

            zInfoUserService.updateById(zu);
        }

@@ -379,6 +384,10 @@
                ZInfoUser zu = new ZInfoUser();
                zu.setUserId(userAll.getSpouseId());
                zu.setSpouseId(infoUser.getUserId());
                Long spouseMoM = zInfoUserService.getById(userAll.getSpouseId()).getMomId();
                Long spouseDad = zInfoUserService.getById(userAll.getSpouseId()).getFatherId();
                zu.setMomId(spouseMoM);
                zu.setFatherId(spouseDad);
                zInfoUserService.updateById(zu);
            }
        }

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java

@@ -12,6 +12,7 @@
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.ServletUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.domain.ShareMore;
import com.ruoyi.domain.ZInfoUser;
import com.ruoyi.domain.ZfDoctor;
import com.ruoyi.domain.ZfRelation;
@@ -380,6 +381,14 @@
        return zInfoUserService.getInfoByfid(fid);
    }

    /**
     //     * 分享给其他家族数据，通过输入名字查找所有的同名用户和家族号
     //     */
    @PostMapping("/byName")
    public AjaxResult listByNickNameDate(@RequestBody ZInfoUser zInfoUser)
    {
        return zInfoUserService.findInfoUserNameAClan(zInfoUser.getNickName());
    }

}


 ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfDoctorShareController.java

@@ -38,7 +38,6 @@
        zfDoctor.setSysMenuId(2019L);
        return zfDoctorShareService.saveZa(zfDoctor);
    }

    /**
     * 根据UserId和分享人shareId查看已经授权给那些人那些数据
     */

 zhang-content/src/main/java/com/ruoyi/domain/ShareMore.java

@@ -29,4 +29,14 @@
     * 分享的模块
     */
    private Long sysMenuId;

    /**
     * 分享个其他家族输入名字
     */
    private String nickName;

    /**
     * 分享给的用户的家族
     */
    private Integer clanId;
}

 zhang-content/src/main/java/com/ruoyi/domain/ShareOtherClan.java

New file
@@ -0,0 +1,21 @@
package com.ruoyi.domain;

import lombok.Data;

@Data
public class ShareOtherClan {
    /**
     * 分享给的那个人的id
     */
    private Integer userId;

    /**
     * 分享给的那个人的名字
     */
    private String nickName;

    /**
     * 分享给的那个人的家族id
     */
    private Integer clanId;
}

 zhang-content/src/main/java/com/ruoyi/service/ZInfoUserService.java

@@ -26,6 +26,8 @@

    List<ZInfoUser> selectByClanId(Integer clanId);

    AjaxResult findInfoUserNameAClan(String nickName);

    List<ZInfoUser> getDataBySex(Integer sex,Integer clanId);

    public ZInfoUser getInfoBysysId(Long sysid);

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

@@ -91,6 +91,34 @@
        return list(lqw);
    }


//    public List<ZInfoUser> selectByNickName(String nickName){
//        ZInfoUser zInfoUser = new ZInfoUser();
//        zInfoUser.setNickName(nickName);
//        LambdaQueryWrapper<ZInfoUser> lqw = buildCondition(zInfoUser);
//        return list(lqw);
//    }

    @Override
    public AjaxResult findInfoUserNameAClan(String nickName)
    {
        ZInfoUser zInfoUser = new ZInfoUser();
        zInfoUser.setNickName(nickName);

        LambdaQueryWrapper<ZInfoUser> lqw = buildCondition(zInfoUser);
        List<ZInfoUser> zInfoUsers = list(lqw);
        List<ShareOtherClan> shareOtherClans = new ArrayList<>();

        for (ZInfoUser zInfoUser1: zInfoUsers) {
            ShareOtherClan shareOtherClan = new ShareOtherClan();
            shareOtherClan.setNickName(zInfoUser1.getNickName());
            shareOtherClan.setUserId(zInfoUser1.getUserId().intValue());
            shareOtherClan.setClanId(zInfoUser1.getClanId());
            shareOtherClans.add(shareOtherClan);
        }
        return AjaxResult.success(shareOtherClans);
    }

    @Override
    public ZInfoUser getInfoBysysId(Long sysid) {
        LambdaQueryWrapper<ZInfoUser> lqw = new LambdaQueryWrapper<>();

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

@@ -40,6 +40,9 @@
        lqw.eq(StringUtils.isNotEmpty(String.valueOf(zfShare.getSysMenuId())), ZfShare::getSysMenuId, zfShare.getSysMenuId());
        return lqw;
    }



    @Override
    public List<ZfShare> getAuthority() {
        SysUser user = SecurityUtils.getLoginUser().getUser();
@@ -51,6 +54,7 @@
        return list(lqw);
    }


    @Resource
    ZfDoctorShareService zfDoctorShareService;