|
|
@@ -32,7 +32,8 @@
|
|
|
a.is_deleted as isDeleted
|
|
|
FROM kl_relation a
|
|
|
JOIN kl_concept b on a.start_id=b.id
|
|
|
- JOIN kl_concept c on a.end_id=c.id) t
|
|
|
+ JOIN kl_concept c on a.end_id=c.id
|
|
|
+ WHERE a.relation_id NOT IN(17,18)) t
|
|
|
where 1=1
|
|
|
<if test="isDeleted!=null and isDeleted!=''">
|
|
|
and isDeleted=#{isDeleted}
|
|
|
@@ -119,7 +120,7 @@
|
|
|
t3.lib_name AS libName,
|
|
|
t4.name AS libType,
|
|
|
CONCAT(t3.lib_name,'(',t4.name,')') AS libNameType,
|
|
|
- GROUP_CONCAT(t2.lib_name ORDER BY t1.gmt_modified DESC) AS otherNames,
|
|
|
+ GROUP_CONCAT(t2.lib_name ORDER BY t5.order_no DESC,t1.gmt_modified DESC) AS otherNames,
|
|
|
t1.modifier AS operName,
|
|
|
MAX(t1.gmt_modified) AS operTime,
|
|
|
t1.is_deleted AS isDeleted
|
|
|
@@ -135,6 +136,7 @@
|
|
|
JOIN kl_concept t2 ON t1.start_id=t2.id
|
|
|
JOIN kl_concept t3 ON t1.end_id=t3.id
|
|
|
JOIN kl_lexicon t4 ON t3.lib_type=t4.id
|
|
|
+ LEFT JOIN kl_relation_order t5 ON t1.id=t5.t_relation_id
|
|
|
where t2.is_deleted='N' AND t3.is_deleted='N' AND t4.is_deleted='N'
|
|
|
GROUP BY t3.id) tab
|
|
|
where 1=1
|
|
|
@@ -153,7 +155,7 @@
|
|
|
t3.lib_name AS libName,
|
|
|
t4.name AS libType,
|
|
|
CONCAT(t3.lib_name,'(',t4.name,')') AS libNameType,
|
|
|
- GROUP_CONCAT(t2.lib_name ORDER BY t1.gmt_modified DESC) AS otherNames,
|
|
|
+ GROUP_CONCAT(t2.lib_name ORDER BY t5.order_no DESC,t1.gmt_modified DESC) AS otherNames,
|
|
|
t1.modifier AS operName,
|
|
|
MAX(t1.gmt_modified) AS operTime,
|
|
|
t1.is_deleted AS isDeleted
|
|
|
@@ -161,6 +163,7 @@
|
|
|
JOIN kl_concept t2 ON t1.start_id=t2.id
|
|
|
JOIN kl_concept t3 ON t1.end_id=t3.id
|
|
|
JOIN kl_lexicon t4 ON t3.lib_type=t4.id
|
|
|
+ LEFT JOIN kl_relation_order t5 ON t1.id=t5.t_relation_id
|
|
|
WHERE t2.is_deleted='N' AND t3.is_deleted='N' AND t4.is_deleted='N'
|
|
|
AND t1.relation_id=18
|
|
|
GROUP BY t3.id) tab
|
rgb