用户修改姓名和电话同步修改uaid

zqy

5 天以前 b02beccf4567068cb47a3f1181a00039456c872d

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

@@ -72,30 +72,53 @@
        return lqw;
    }


    private LambdaQueryWrapper<ZSelfNote> buildConditionSec(ZSelfNote zSelfNote,List<Long> userIds) {
        LambdaQueryWrapper<ZSelfNote> lqw = new LambdaQueryWrapper<>();
     //   lqw.in(ZSelfNote::getUid, getAll())

        lqw.in(ZSelfNote::getUid, userIds)
                .like(StringUtils.isNotEmpty(zSelfNote.getPeople()), ZSelfNote::getPeople, zSelfNote.getPeople())
                .like(StringUtils.isNotEmpty(zSelfNote.getTitle()), ZSelfNote::getTitle, zSelfNote.getTitle())
                .like(StringUtils.isNotEmpty(zSelfNote.getAddress()),ZSelfNote::getAddress,zSelfNote.getAddress())
                .like(StringUtils.isNotEmpty(zSelfNote.getRemark()),ZSelfNote::getRemark,zSelfNote.getRemark())
                .between(zSelfNote.getHappenStartTime() != null && zSelfNote.getHappenEndTime() != null, ZSelfNote::getHappenTime, zSelfNote.getHappenStartTime(), zSelfNote.getHappenEndTime())
                .orderByDesc(ZSelfNote::getCreateTime);
        return lqw;
    }

//    public List<ZfShareData> getAllByShareId(ZfShareData zfShareData1){
//        SysUser user = SecurityUtils.getLoginUser().getUser();
//        Long userId = user.getUserId();
//
//        ZfShareData zfShareData = new ZfShareData();
//        zfShareData.setUserId(userId.intValue());
//        List<ZfShareData> zfShareDataList = zfShareDataService.selectList(zfShareData);
//        zfShareData.setUserId(zfShareData1.getUserId());
//        zfShareDataList.addAll(zfShareDataService.selectList(zfShareData));
//        return zfShareDataList;
//    }

    public List<Long> getAll(){
        SysUser user = SecurityUtils.getLoginUser().getUser();
        Long userId = user.getUserId();
        List<Long> allList = new ArrayList<>();
        Long source = zfShareDataService.getSource(userId);
        allList.add(source);
        allList.addAll(zfShareDataService.getAllPerson(Collections.singletonList(source)));

        List<ZfShareData> shareId = zfShareDataService.getShareId(userId);
        List<ZfShareData> zfShareDataList = zfShareDataService.selectList();
        List<Long> collect = allList.stream().distinct().collect(Collectors.toList());

        List<Long> all = new ArrayList<>();
        all.add(userId);
        if(shareId.size() >0 ) {
            if (shareId.get(0).getMasterAccount() == 0 || shareId.get(0).getMasterAccount() == userId.intValue()) {
                all.add(shareId.get(0).getUserId().longValue());
            }
            else {
                all.clear();
                all.add(0L);
                return all;
            }
        }
        if (zfShareDataList.size()>0 && (zfShareDataList.get(0).getMasterAccount() == 0 || zfShareDataList.get(0).getMasterAccount() == userId.intValue())){
            for (ZfShareData zfShareOther: zfShareDataList) {
                all.add(zfShareOther.getSharedId().longValue());
            }
        }

        if(collect.size() > 1 ) {
            Integer masterAccount = zfShareDataService.getByShareId(collect).get(0).getMasterAccount();
            if (masterAccount != 0 || masterAccount != userId.intValue()) {
                all.clear();
            }
            all.addAll(collect);
        }
        return all;
    }

@@ -104,17 +127,16 @@
     */
    @Override
    public AjaxResult selectDataList(ZSelfNote zSelfNote, Integer pageNum, Integer pageSize) {
        LambdaQueryWrapper<ZSelfNote> lqw = buildCondition(zSelfNote);

        SysUser user = SecurityUtils.getLoginUser().getUser();
        Long userId = user.getUserId();
        List<ZfShareData> zfShareOtherList = zfShareDataService.selectList();
        List<ZfShareData> shareId = zfShareDataService.getShareId(userId);
        if (list(lqw).size()==0) {

        List<Long> all = getAll();
        if (all.contains(userId)) {
            List<ZfShareData> byShareId = zfShareDataService.getByShareId(all);
            Integer masterAccount = 0;
            if(zfShareOtherList.size()>0 ){
             masterAccount = zfShareOtherList.get(0).getMasterAccount();}
            if(shareId.size()>0){
                masterAccount = shareId.get(0).getMasterAccount();
            if(byShareId.size()>0){
                masterAccount = byShareId.get(0).getMasterAccount();
            }
            ZInfoUser infoBysysId = zInfoUserService.getInfoBysysId(masterAccount.longValue());
            if (infoBysysId !=null)
@@ -122,7 +144,16 @@
            return AjaxResult.success("请前往家族名称为"+byId.getClanName()+",用户名为"+infoBysysId.getNickName()+"的用户账号下查看");
            }
        }

       // LambdaQueryWrapper<ZSelfNote> lqw = buildCondition(zSelfNote);
        //根据userId查询到infouser的uaid
        ZInfoUser zInfoUser = zInfoUserService.getInfoBysysId(userId);
        //拿到所有的sysid
        List<Long> fms = zInfoUserService.findByUaidToFaid(zInfoUser.getUaid()).stream().map(ZInfoUser::getSysId).collect(Collectors.toList());
        LambdaQueryWrapper<ZSelfNote> lqw;
        if(!fms.isEmpty())
            lqw = buildConditionSec(zSelfNote, fms);
        else
            lqw = buildCondition(zSelfNote);
        Page<ZSelfNote> pageBean = new Page<>(pageNum, pageSize);
        Page<ZSelfNote> pageResult = page(pageBean, lqw);