diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/CsStatisticalSetPOServiceImpl.java b/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/CsStatisticalSetPOServiceImpl.java index 42967be32..cdc521691 100644 --- a/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/CsStatisticalSetPOServiceImpl.java +++ b/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/CsStatisticalSetPOServiceImpl.java @@ -3,23 +3,27 @@ package com.njcn.system.service.impl; import cn.hutool.core.collection.CollectionUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.jeffreyning.mybatisplus.service.MppServiceImpl; +import com.njcn.system.mapper.CsStatisticalSetPOMapper; import com.njcn.system.pojo.param.CsStatisticalSetAddParam; -import com.njcn.system.pojo.po.*; +import com.njcn.system.pojo.po.CsStatisticalSetPO; +import com.njcn.system.pojo.po.EleEpdPqd; import com.njcn.system.pojo.vo.CsStatisticalSetVO; import com.njcn.system.pojo.vo.DictTreeVO; import com.njcn.system.pojo.vo.EleEpdPqdListVO; +import com.njcn.system.service.CsStatisticalSetPOService; import com.njcn.system.service.IEleEpdPqdService; import com.njcn.system.service.SysDicTreePOService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; -import java.util.*; -import java.util.stream.Collectors; - -import com.njcn.system.mapper.CsStatisticalSetPOMapper; -import com.njcn.system.service.CsStatisticalSetPOService; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.stream.Collectors; + /** * * Description: @@ -128,6 +132,9 @@ public class CsStatisticalSetPOServiceImpl extends MppServiceImpl result = this.baseMapper.selectList(queryWrap); List collect = result.stream().map(CsStatisticalSetPO::getTargetId).collect(Collectors.toList()); + if(CollectionUtils.isEmpty(collect)){ + return new ArrayList<>(); + } List eleEpdPqds = epdPqdService.listByIds(collect); return eleEpdPqds; }