fix(国内标准): 80638

This commit is contained in:
yjz
2024-01-24 16:01:16 +08:00
parent f007262025
commit 37a1255de7
@@ -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.home.service.ILawsHomeSearchService;
import com.jero.modules.laws.standard.entity.*; import com.jero.modules.laws.standard.entity.*;
import com.jero.modules.laws.standard.service.*; 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.entity.LawsStandardization;
import com.jero.modules.laws.standardization.service.ILawsStandardizationService; import com.jero.modules.laws.standardization.service.ILawsStandardizationService;
import com.jero.modules.oss.entity.OSSFile; import com.jero.modules.oss.entity.OSSFile;
@@ -2352,18 +2353,12 @@ public class LawsCommonServiceImpl implements ILawsCommonService {
**/ **/
@Override @Override
public List<LawsDictModel> getBiddingCommittee() { public List<LawsDictModel> getBiddingCommittee() {
LambdaQueryWrapper<LawsStandardization> parentQueryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<LawsStandardization> queryWrapper = new LambdaQueryWrapper<>();
parentQueryWrapper.eq(LawsStandardization::getPid, "0"); queryWrapper.eq(LawsStandardization::getStandardizationType, LawsStandardizationCommon.FBW);
List<LawsStandardization> parentList = lawsStandardizationService.list(parentQueryWrapper); List<LawsStandardization> standardizationList = lawsStandardizationService.list(queryWrapper);
if (CollectionUtils.isEmpty(parentList)) { if (CollectionUtils.isEmpty(standardizationList)) {
return new ArrayList<>(); return new ArrayList<>();
} }
List<String> parentIds = parentList.stream().map(LawsStandardization::getId).collect(Collectors.toList());
LambdaQueryWrapper<LawsStandardization> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.in(LawsStandardization::getPid, parentIds);
List<LawsStandardization> standardizationList = lawsStandardizationService.list(queryWrapper);
List<LawsDictModel> lawsDictModelList = new ArrayList<>(); List<LawsDictModel> lawsDictModelList = new ArrayList<>();
standardizationList.forEach(standardization -> { standardizationList.forEach(standardization -> {
LawsDictModel lawsDictModel = new LawsDictModel(); LawsDictModel lawsDictModel = new LawsDictModel();