From bfbead7c55e17d87eab95a0b47dfae1509afa869 Mon Sep 17 00:00:00 2001 From: liujiang <569804566@qq.com> Date: Fri, 12 Sep 2025 10:58:15 +0800 Subject: [PATCH] =?UTF-8?q?master=EF=BC=9A=E6=8E=A8=E5=B9=BF=E8=90=A5?= =?UTF-8?q?=E9=94=80=E8=B0=83=E4=BC=98=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/AdvertRoundServiceImpl.java | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/impl/AdvertRoundServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/AdvertRoundServiceImpl.java index 5d46a4cb4..d25cbfeef 100644 --- a/xkt/src/main/java/com/ruoyi/xkt/service/impl/AdvertRoundServiceImpl.java +++ b/xkt/src/main/java/com/ruoyi/xkt/service/impl/AdvertRoundServiceImpl.java @@ -485,15 +485,18 @@ public class AdvertRoundServiceImpl implements IAdvertRoundService { AdvertRound advertRound = this.advertRoundMapper.selectOne(new LambdaQueryWrapper() .eq(AdvertRound::getId, advertRoundId).eq(AdvertRound::getDelFlag, Constants.UNDELETED)); AdRoundLatestResDTO roundSetInfoDTO = new AdRoundLatestResDTO(); - if (ObjectUtils.isEmpty(advertRound)) { + if (ObjectUtils.isEmpty(advertRound) || ObjectUtils.isEmpty(advertRound.getStoreId())) { return roundSetInfoDTO; } - List storeProdList = Optional.ofNullable(this.storeProdMapper.selectList(new LambdaQueryWrapper() - .in(StoreProduct::getId, StrUtil.split(advertRound.getProdIdStr(), ",")) - .eq(StoreProduct::getDelFlag, Constants.UNDELETED).eq(StoreProduct::getStoreId, advertRound.getStoreId()))) - .orElseThrow(() -> new ServiceException("档口商品不存在!", HttpStatus.ERROR)); - return roundSetInfoDTO.setProdList(storeProdList.stream().map(x -> new AdRoundLatestResDTO.ARLProdDTO() - .setStoreProdId(x.getId()).setProdArtNum(x.getProdArtNum())).collect(Collectors.toList())); + if (StringUtils.isNotEmpty(advertRound.getProdIdStr())) { + List storeProdList = Optional.ofNullable(this.storeProdMapper.selectList(new LambdaQueryWrapper() + .in(StoreProduct::getId, StrUtil.split(advertRound.getProdIdStr(), ",")) + .eq(StoreProduct::getDelFlag, Constants.UNDELETED).eq(StoreProduct::getStoreId, advertRound.getStoreId()))) + .orElseThrow(() -> new ServiceException("档口商品不存在!", HttpStatus.ERROR)); + return roundSetInfoDTO.setProdList(storeProdList.stream().map(x -> new AdRoundLatestResDTO.ARLProdDTO() + .setStoreProdId(x.getId()).setProdArtNum(x.getProdArtNum())).collect(Collectors.toList())); + } + return roundSetInfoDTO; }