wangyu 6 anos atrás
pai
commit
ff7ba10e08

+ 9 - 9
aipt-service/src/main/resources/mapper/ConceptMapper.xml

@@ -550,7 +550,7 @@
         (SELECT b1.*,b2.id uniqueId,b2.lib_name uniqueName
         FROM (SELECT 0 selfId,t1.lib_name selfName,t5.id parentId,t5.lib_name parentName,null sameName,t2.is_concept showType,t5.lib_type libTypeId,t6.`name` libTypeName FROM kl_concept t1
         LEFT JOIN kl_library_info t2 ON t1.id = t2.concept_id
-        LEFT JOIN kl_relation t4 ON t4.end_id= t1.id
+        LEFT JOIN kl_relation t4 ON t4.end_id = t1.id
         LEFT JOIN kl_concept t5 on t5.id = t4.start_id
         LEFT JOIN kl_lexicon t6 ON t6.id = t5.lib_type
         LEFT JOIN kl_concept_common t3 ON t5.id = t3.concept_id
@@ -576,7 +576,7 @@
         (SELECT b1.*,b2.id uniqueId,b2.lib_name uniqueName
         FROM (SELECT 0 selfId,t1.lib_name selfName,t5.id parentId,t5.lib_name parentName,null sameName,t2.is_concept showType,t5.lib_type libTypeId,t6.`name` libTypeName FROM kl_concept t1
         LEFT JOIN kl_library_info t2 ON t1.id = t2.concept_id
-        LEFT JOIN kl_relation t4 ON t4.end_id= t1.id
+        LEFT JOIN kl_relation t4 ON t4.end_id = t1.id
         LEFT JOIN kl_concept t5 on t5.id = t4.start_id
         LEFT JOIN kl_lexicon t6 ON t6.id = t5.lib_type
         LEFT JOIN kl_concept_common t3 ON t5.id = t3.concept_id
@@ -602,7 +602,7 @@
         (SELECT b1.*,b2.id uniqueId,b2.lib_name uniqueName
         FROM (SELECT 0 selfId,t1.lib_name selfName,t5.id parentId,t5.lib_name parentName,null sameName,t2.is_concept showType,t5.lib_type libTypeId,t6.`name` libTypeName FROM kl_concept t1
                     LEFT JOIN kl_library_info t2 ON t1.id = t2.concept_id
-                    LEFT JOIN kl_relation t4 ON t4.end_id= t1.id
+                    LEFT JOIN kl_relation t4 ON t4.end_id = t1.id
                     LEFT JOIN kl_concept t5 on t5.id = t4.start_id
                     LEFT JOIN kl_lexicon t6 ON t6.id = t5.lib_type
                     LEFT JOIN kl_concept_common t3 ON t5.id = t3.concept_id
@@ -630,7 +630,7 @@
         (SELECT b1.*,b2.id uniqueId,b2.lib_name uniqueName
         FROM (SELECT t1.id selfId,t1.lib_name selfName,t5.id parentId,t5.lib_name parentName,null sameName,t2.is_concept showType,t1.lib_type libTypeId,t6.`name` libTypeName FROM kl_concept t1
         LEFT JOIN kl_library_info t2 ON t1.id = t2.concept_id
-        LEFT JOIN kl_relation t4 ON t4.end_id= t1.id
+        LEFT JOIN kl_relation t4 ON t4.end_id = t1.id
         LEFT JOIN kl_concept t5 on t5.id = t4.start_id
         LEFT JOIN kl_lexicon t6 ON t6.id = t1.lib_type
         LEFT JOIN kl_concept_common t3 ON t1.id = t3.concept_id
@@ -644,7 +644,7 @@
         AND t1.lib_type = #{detailType}
         AND (t2.spell = UPPER(#{InputStr}) OR t2.name = #{InputStr})
         AND t4.relation_id = 18
-        GROUP BY t5.id) b1,
+        GROUP BY t5.id,t1.id) b1,
         kl_concept b2,
         kl_concept_detail b3
         WHERE b2.is_deleted = 'N'
@@ -656,7 +656,7 @@
         (SELECT b1.*,b2.id uniqueId,b2.lib_name uniqueName
         FROM (SELECT t1.id selfId,t1.lib_name selfName,t5.id parentId,t5.lib_name parentName,null sameName,t2.is_concept showType,t1.lib_type libTypeId,t6.`name` libTypeName FROM kl_concept t1
         LEFT JOIN kl_library_info t2 ON t1.id = t2.concept_id
-        LEFT JOIN kl_relation t4 ON t4.end_id= t1.id
+        LEFT JOIN kl_relation t4 ON t4.end_id = t1.id
         LEFT JOIN kl_concept t5 on t5.id = t4.start_id
         LEFT JOIN kl_lexicon t6 ON t6.id = t1.lib_type
         LEFT JOIN kl_concept_common t3 ON t1.id = t3.concept_id
@@ -670,7 +670,7 @@
         AND t1.lib_type = #{detailType}
         AND (t2.spell LIKE CONCAT(UPPER(#{InputStr}),'%') OR t2.name LIKE CONCAT(#{InputStr},'%'))
         AND t4.relation_id = 18
-        GROUP BY t5.id) b1,
+        GROUP BY t5.id,t1.id) b1,
         kl_concept b2,
         kl_concept_detail b3
         WHERE b2.is_deleted = 'N'
@@ -682,7 +682,7 @@
         (SELECT b1.*,b2.id uniqueId,b2.lib_name uniqueName
         FROM (SELECT t1.id selfId,t1.lib_name selfName,t5.id parentId,t5.lib_name parentName,null sameName,t2.is_concept showType,t1.lib_type libTypeId,t6.`name` libTypeName FROM kl_concept t1
                     LEFT JOIN kl_library_info t2 ON t1.id = t2.concept_id
-                    LEFT JOIN kl_relation t4 ON t4.end_id= t1.id
+                    LEFT JOIN kl_relation t4 ON t4.end_id = t1.id
                     LEFT JOIN kl_concept t5 on t5.id = t4.start_id
                     LEFT JOIN kl_lexicon t6 ON t6.id = t1.lib_type
                     LEFT JOIN kl_concept_common t3 ON t1.id = t3.concept_id
@@ -696,7 +696,7 @@
                     AND t1.lib_type = #{detailType}
                     AND (t2.spell LIKE CONCAT('%',UPPER(#{InputStr}),'%') OR t2.name LIKE CONCAT('%',#{InputStr},'%'))
                     AND t4.relation_id = 18
-                    GROUP BY t5.id) b1,
+                    GROUP BY t5.id,t1.id) b1,
                         kl_concept b2,
                         kl_concept_detail b3
         WHERE b2.is_deleted = 'N'