Browse Source

代码优化

gaodm 6 năm trước cách đây
mục cha
commit
7be24a8bd8

+ 6 - 3
aipt-service/src/main/java/com/diagbot/facade/ConceptDetailFacade.java

@@ -127,15 +127,18 @@ public class ConceptDetailFacade extends ConceptDetailServiceImpl {
         List<Concept> concepts = conceptFacade.getListByNamesAndType(nameList, libType);
         Map<String, Concept> retMap = new LinkedHashMap<>();
         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<>();
             conceptDetailQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
                     .in("concept_id", conceptIds);
             List<ConceptDetail> conceptDetailList = this.list(conceptDetailQueryWrapper);
             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) {
-                    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);
                     }
                 }