|
@@ -127,15 +127,18 @@ public class ConceptDetailFacade extends ConceptDetailServiceImpl {
|
|
List<Concept> concepts = conceptFacade.getListByNamesAndType(nameList, libType);
|
|
List<Concept> concepts = conceptFacade.getListByNamesAndType(nameList, libType);
|
|
Map<String, Concept> retMap = new LinkedHashMap<>();
|
|
Map<String, Concept> retMap = new LinkedHashMap<>();
|
|
if (ListUtil.isNotEmpty(concepts)) {
|
|
if (ListUtil.isNotEmpty(concepts)) {
|
|
- List<Long> conceptIds = concepts.stream().map(concept -> concept.getId()).collect(Collectors.toList());
|
|
|
|
|
|
+ List<Long> conceptIds
|
|
|
|
+ = concepts.stream().map(concept -> concept.getId()).collect(Collectors.toList());
|
|
QueryWrapper<ConceptDetail> conceptDetailQueryWrapper = new QueryWrapper<>();
|
|
QueryWrapper<ConceptDetail> conceptDetailQueryWrapper = new QueryWrapper<>();
|
|
conceptDetailQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
|
|
conceptDetailQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
|
|
.in("concept_id", conceptIds);
|
|
.in("concept_id", conceptIds);
|
|
List<ConceptDetail> conceptDetailList = this.list(conceptDetailQueryWrapper);
|
|
List<ConceptDetail> conceptDetailList = this.list(conceptDetailQueryWrapper);
|
|
if (ListUtil.isNotEmpty(conceptDetailList)) {
|
|
if (ListUtil.isNotEmpty(conceptDetailList)) {
|
|
- Map<Long, ConceptDetail> conceptDetailMap = EntityUtil.makeEntityMap(conceptDetailList, "conceptId");
|
|
|
|
|
|
+ Map<Long, List<ConceptDetail>> conceptDetailMap
|
|
|
|
+ = EntityUtil.makeEntityListMap(conceptDetailList, "conceptId");
|
|
for (Concept concept : concepts) {
|
|
for (Concept concept : concepts) {
|
|
- if (conceptDetailMap.containsKey(concept.getId()) && conceptDetailMap.get(concept.getId()) != null) {
|
|
|
|
|
|
+ if (conceptDetailMap.containsKey(concept.getId())
|
|
|
|
+ && ListUtil.isNotEmpty(conceptDetailMap.get(concept.getId()))) {
|
|
retMap.put(concept.getLibName(), concept);
|
|
retMap.put(concept.getLibName(), concept);
|
|
}
|
|
}
|
|
}
|
|
}
|