feige
2025-07-08 f1831ec9329d0fb5e424b35064ca8e5f05a7920a
zhang-content/src/main/java/com/ruoyi/service/impl/ZSelfNoteServiceImpl.java
@@ -72,6 +72,21 @@
        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();
@@ -112,7 +127,7 @@
     */
    @Override
    public AjaxResult selectDataList(ZSelfNote zSelfNote, Integer pageNum, Integer pageSize) {
        LambdaQueryWrapper<ZSelfNote> lqw = buildCondition(zSelfNote);
        SysUser user = SecurityUtils.getLoginUser().getUser();
        Long userId = user.getUserId();
@@ -129,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);