代码整理

knowledgeman-service/src/main/java/com/diagbot/facade/ConceptFacade.java

@@ -169,6 +169,9 @@ public class ConceptFacade extends ConceptServiceImpl {
                 "is_concept", getAllConceptVO.getIsConcept());
         libraryInfoQe.like("name", getAllConceptVO.getName());
         List<LibraryInfo> libraryInfoList = libraryinfoFacade.list(libraryInfoQe);
+        if (ListUtil.isEmpty(libraryInfoList)) {
+            return getAllConceptDTOList;
+        }
 
         //过滤掉非概念术语
         if (getAllConceptVO.getIsConcept() != null && getAllConceptVO.getIsConcept() == 1) {
@@ -254,13 +257,13 @@ public class ConceptFacade extends ConceptServiceImpl {
                     if (ListUtil.isNotEmpty(relationConceptIdList)) {
                         if (getAllForRelationVO.getRelationPosition() == 1) {
                             relationQe.in("start_id", conceptIdList);
-                            relationQe.in("end_id", relationConceptIdList);
+                            relationQe.in(ListUtil.isNotEmpty(relationConceptIdList), "end_id", relationConceptIdList);
                             reCouMap = relationFacade.list(relationQe)
                                     .stream()
                                     .collect(Collectors.groupingBy(Relation::getStartId, Collectors.counting()));
                         } else {
                             relationQe.in("end_id", conceptIdList);
-                            relationQe.in("start_id", relationConceptIdList);
+                            relationQe.in(ListUtil.isNotEmpty(relationConceptIdList), "start_id", relationConceptIdList);
                             reCouMap = relationFacade.list(relationQe)
                                     .stream()
                                     .collect(Collectors.groupingBy(Relation::getEndId, Collectors.counting()));
@@ -1223,7 +1226,7 @@ public class ConceptFacade extends ConceptServiceImpl {
         if (ids.size() == 1) {
             conceptQueryWrapper.eq("id", ids.get(0));
         } else {
-            conceptQueryWrapper.in("id", ids);
+            conceptQueryWrapper.in(ListUtil.isNotEmpty(ids), "id", ids);
         }
 
         List<Concept> list = this.list(conceptQueryWrapper);
@@ -1363,7 +1366,7 @@ public class ConceptFacade extends ConceptServiceImpl {
     public List<Concept> getListByNamesAndType(List<String> nameList, Integer libType) {
         QueryWrapper<Concept> conceptQueryWrapper = new QueryWrapper<>();
         conceptQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
-                .in("lib_name", nameList);
+                .in(ListUtil.isNotEmpty(nameList), "lib_name", nameList);
         if (libType != null) {
             conceptQueryWrapper.eq("lib_type", libType);
         }