QR/laws_chery_serve
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 88187 外来标准法规文本库--代替标准的被代替标准编号显示了标准本身

Browse Source
This commit is contained in:
mzaxd
2024-08-08 14:07:23 +08:00
parent f83799020c
commit 65b87c8711
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java
+1 -1
View File
@@ -1348,7 +1348,7 @@ public class LawsCommonServiceImpl implements ILawsCommonService {
Map<String, Object> stringObjectMap = processResultMap(initMap, fieldList); Map<String, Object> stringObjectMap = processResultMap(initMap, fieldList);
if (module.equals(TableNameEnum.ENTERPRISE_STANDARDS.getValue())) { if (module.equals(TableNameEnum.ENTERPRISE_STANDARDS.getValue())) {
// 企标独有的稽查内容列表 // 企标独有的监察内容列表
LambdaQueryWrapper<EnterpriseStandardInspectContent> esIcWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<EnterpriseStandardInspectContent> esIcWrapper = new LambdaQueryWrapper<>();
esIcWrapper.eq(EnterpriseStandardInspectContent::getStandardId, id); esIcWrapper.eq(EnterpriseStandardInspectContent::getStandardId, id);
List<EnterpriseStandardInspectContent> list = esInspectContentService.list(esIcWrapper); List<EnterpriseStandardInspectContent> list = esInspectContentService.list(esIcWrapper);
laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsReplacedStandardServiceImpl.java
+1
View File
@@ -131,6 +131,7 @@ public class LawsReplacedStandardServiceImpl extends ServiceImpl<LawsReplacedSta
return ""; return "";
} }
List<String> replacedByList = replacedStandardList.stream() List<String> replacedByList = replacedStandardList.stream()
.filter(e -> e.getReplaced().equals(e.getReplaced().split("《")[0]))
.map(LawsReplacedStandard::getReplacedBy).collect(Collectors.toList()); .map(LawsReplacedStandard::getReplacedBy).collect(Collectors.toList());
return StringUtils.join(replacedByList, ","); return StringUtils.join(replacedByList, ",");
} }