From f1831ec9329d0fb5e424b35064ca8e5f05a7920a Mon Sep 17 00:00:00 2001 From: feige <791364011@qq.com> Date: 星期二, 08 七月 2025 22:21:34 +0800 Subject: [PATCH] 修改了数据 --- zhang-content/src/main/java/com/ruoyi/service/impl/ZSelfNoteServiceImpl.java | 28 ++++++++++++++++++++++++++-- 1 files changed, 26 insertions(+), 2 deletions(-) diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZSelfNoteServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZSelfNoteServiceImpl.java index fadc2f0..978c608 100644 --- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZSelfNoteServiceImpl.java +++ b/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鏌ヨ鍒癷nfouser鐨剈aid + 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); -- Gitblit v1.9.1