From 37a1255de74365f0f8bfb2154da36ea39f0021fc Mon Sep 17 00:00:00 2001 From: yjz <3131811435@qq.com> Date: Wed, 24 Jan 2024 16:01:16 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E5=9B=BD=E5=86=85=E6=A0=87=E5=87=86):=2080?= =?UTF-8?q?638?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/LawsCommonServiceImpl.java | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java index 842af51a..a85110d8 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java @@ -34,6 +34,7 @@ import com.jero.modules.laws.home.common.LawsHomeSearchCommon; import com.jero.modules.laws.home.service.ILawsHomeSearchService; import com.jero.modules.laws.standard.entity.*; import com.jero.modules.laws.standard.service.*; +import com.jero.modules.laws.standardization.common.LawsStandardizationCommon; import com.jero.modules.laws.standardization.entity.LawsStandardization; import com.jero.modules.laws.standardization.service.ILawsStandardizationService; import com.jero.modules.oss.entity.OSSFile; @@ -2352,18 +2353,12 @@ public class LawsCommonServiceImpl implements ILawsCommonService { **/ @Override public List getBiddingCommittee() { - LambdaQueryWrapper parentQueryWrapper = new LambdaQueryWrapper<>(); - parentQueryWrapper.eq(LawsStandardization::getPid, "0"); - List parentList = lawsStandardizationService.list(parentQueryWrapper); - if (CollectionUtils.isEmpty(parentList)) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(LawsStandardization::getStandardizationType, LawsStandardizationCommon.FBW); + List standardizationList = lawsStandardizationService.list(queryWrapper); + if (CollectionUtils.isEmpty(standardizationList)) { return new ArrayList<>(); } - List parentIds = parentList.stream().map(LawsStandardization::getId).collect(Collectors.toList()); - - LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.in(LawsStandardization::getPid, parentIds); - List standardizationList = lawsStandardizationService.list(queryWrapper); - List lawsDictModelList = new ArrayList<>(); standardizationList.forEach(standardization -> { LawsDictModel lawsDictModel = new LawsDictModel();