From b4754ea670156f7f799311a9fdc9b3d380982fcb Mon Sep 17 00:00:00 2001 From: Jinquan_Ou <Jinquan@gdut.com> Date: 星期四, 06 四月 2023 18:23:00 +0800 Subject: [PATCH] 555 --- zhang-content/src/main/java/com/ruoyi/service/impl/ZfEventServiceImpl.java | 42 +++++++++++++++++++++++++++++++++++++----- 1 files changed, 37 insertions(+), 5 deletions(-) diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEventServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEventServiceImpl.java index 998c588..d4f9477 100644 --- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEventServiceImpl.java +++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEventServiceImpl.java @@ -5,16 +5,19 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.common.core.domain.AjaxResult; +import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.utils.MapUtils; +import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.StringUtils; -import com.ruoyi.domain.ZfEvent; +import com.ruoyi.domain.ZInfoUser; import com.ruoyi.domain.ZfEvent; import com.ruoyi.mapper.ZfEventMapper; +import com.ruoyi.service.ZInfoUserService; import com.ruoyi.service.ZfEventService; import lombok.extern.slf4j.Slf4j; -import org.jetbrains.annotations.NotNull; import org.springframework.stereotype.Service; +import javax.annotation.Resource; import java.util.HashMap; import java.util.List; @@ -30,9 +33,23 @@ @Service public class ZfEventServiceImpl extends ServiceImpl<ZfEventMapper, ZfEvent> implements ZfEventService { + @Resource + ZInfoUserService zInfoUserService; + + private String listFamilyIds(){ + SysUser user = SecurityUtils.getLoginUser().getUser(); + Long userId = user.getUserId(); + LambdaQueryWrapper<ZInfoUser> zInfoUserLambdaQueryWrapper = new LambdaQueryWrapper<>(); + zInfoUserLambdaQueryWrapper.eq(ZInfoUser::getUserId,userId); + ZInfoUser zInfoUser = zInfoUserService.getOne(zInfoUserLambdaQueryWrapper); + return zInfoUser.getFamilyId(); + } + + @Override public AjaxResult selectEventList(ZfEvent zfEvent, Integer pageNum, Integer pageSize) { - LambdaQueryWrapper<ZfEvent> lqw = buildCondition(zfEvent); + String familyIds = listFamilyIds(); + LambdaQueryWrapper<ZfEvent> lqw = buildCondition(zfEvent,familyIds); Page<ZfEvent> ZfEventPage = new Page<>(pageNum,pageSize); Page<ZfEvent> pageResult = page(ZfEventPage, lqw); @@ -40,11 +57,13 @@ HashMap<String, Object> data = MapUtils.getResult(pageResult); return AjaxResult.success(data); } + @Override public List<ZfEvent> selectByCondition(ZfEvent zfEvent) { - LambdaQueryWrapper<ZfEvent> lambdaQueryWrapper = buildCondition(zfEvent); - List<ZfEvent> list = list(lambdaQueryWrapper); + String familyIds = listFamilyIds(); + LambdaQueryWrapper<ZfEvent> lqw = buildCondition(zfEvent,familyIds); + List<ZfEvent> list = list(lqw); log.info("杩斿洖鐨勬暟鎹负:{}",list); return list; } @@ -59,4 +78,17 @@ return lqw; } + private LambdaQueryWrapper<ZfEvent> buildCondition(ZfEvent zfEvent, String familyIds) { + LambdaQueryWrapper<ZfEvent> lqw = buildCondition(zfEvent); + if (familyIds.contains(",")) { + String[] familyList = familyIds.split(","); + for (String familyId : familyList) { + lqw.or().eq(ZfEvent::getFamilyId,familyId); + } + }else { + lqw.eq(ZfEvent::getFamilyId,familyIds); + } + return lqw; + } + } -- Gitblit v1.9.1