1、术语关联映射-标准词校验

src/main/java/com/diagbot/facade/KlConceptFacade.java

@@ -75,7 +75,7 @@ public class KlConceptFacade extends KlConceptServiceImpl {
             queryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
                     .in("id", conceptVO.getIds());
             if (conceptVO.getStatus() != null) {
-                queryWrapper.eq("status", StatusEnum.Enable.getKey());
+                queryWrapper.eq("status", conceptVO.getStatus());
             }
             List<KlConcept> concepts = this.list(queryWrapper);
             for (KlConcept concept : concepts) {
@@ -90,7 +90,7 @@ public class KlConceptFacade extends KlConceptServiceImpl {
             QueryWrapper<KlConcept> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey());
             if (conceptVO.getStatus() != null) {
-                queryWrapper.eq("status", StatusEnum.Enable.getKey());
+                queryWrapper.eq("status", conceptVO.getStatus());
             }
             if (ListUtil.isNotEmpty(conceptVO.getNames())) {
                 queryWrapper.in("lib_name", conceptVO.getNames());
@@ -138,7 +138,7 @@ public class KlConceptFacade extends KlConceptServiceImpl {
             conceptQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
                     .in("id", synonymsRelatedConceptIds);
             if (conceptVO.getStatus() != null) {
-                conceptQueryWrapper.eq("status", StatusEnum.Enable.getKey());
+                conceptQueryWrapper.eq("status", conceptVO.getStatus());
             }
             List<KlConcept> synonymsRelatedConcepts = this.list(conceptQueryWrapper);
             Map<Long, KlConcept> conceptMap
@@ -212,12 +212,15 @@ public class KlConceptFacade extends KlConceptServiceImpl {
             klConceptQueryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
                     .in("id", conceptIds);
             if (conceptVO.getStatus() != null) {
-                klConceptQueryWrapper.eq("status", StatusEnum.Enable.getKey());
+                klConceptQueryWrapper.eq("status", conceptVO.getStatus());
             }
-            List<KlConcept> concepts = this.list(new QueryWrapper<KlConcept>()
+            QueryWrapper<KlConcept> qw = new QueryWrapper<KlConcept>()
                     .eq("is_deleted", IsDeleteEnum.N.getKey())
-                    .eq("status", StatusEnum.Enable.getKey())
-                    .in("id", conceptIds));
+                    .in("id", conceptIds);
+            if (conceptVO.getStatus() != null) {
+                qw.eq("status", conceptVO.getStatus());
+            }
+            List<KlConcept> concepts = this.list(qw);
             Map<Long, KlConcept> conceptMap
                     = concepts.stream().collect(Collectors.toMap(KlConcept::getId, v -> v));
             if (conceptMap != null && conceptMap.size() > 0) {
@@ -308,7 +311,7 @@ public class KlConceptFacade extends KlConceptServiceImpl {
         queryWrapper.eq("is_deleted", IsDeleteEnum.N.getKey())
                 .like("lib_name", filterVO.getInputStr());
         if (filterVO != null) {
-            queryWrapper.eq("status", StatusEnum.Enable.getKey());
+            queryWrapper.eq("status", filterVO.getStatus());
         }
         List<KlConcept> klConcepts = this.list(queryWrapper);
         for (KlConcept concept : klConcepts) {