|
@@ -7,10 +7,9 @@
|
|
|
FROM
|
|
|
(
|
|
|
(
|
|
|
- SELECT
|
|
|
+ SELECT
|
|
|
t3.id AS concept_id,
|
|
|
- t3.lib_name AS name,
|
|
|
- t4.order_no AS orderNo
|
|
|
+ t3.lib_name AS name
|
|
|
FROM
|
|
|
`kl_concept` t1,
|
|
|
`kl_relation` t2,
|
|
@@ -25,7 +24,7 @@
|
|
|
AND t3.id = t2.end_id
|
|
|
AND t2.id = t4.t_relation_id
|
|
|
<if test="name != null and name != ''">
|
|
|
- AND t1.lib_name = #{name}
|
|
|
+ AND t1.lib_name LIKE concat ('%',#{name},'%')
|
|
|
</if>
|
|
|
<if test="startType != null">
|
|
|
AND t1.lib_type = #{startType}
|
|
@@ -36,20 +35,17 @@
|
|
|
<if test="endType != null">
|
|
|
AND t3.lib_type = #{endType}
|
|
|
</if>
|
|
|
- ORDER BY
|
|
|
- t4.order_no
|
|
|
)
|
|
|
UNION
|
|
|
(
|
|
|
SELECT
|
|
|
c.id AS concept_id,
|
|
|
- c.lib_name AS name,
|
|
|
- 9999 orderNo
|
|
|
+ c.lib_name AS name
|
|
|
FROM
|
|
|
kl_concept c
|
|
|
WHERE
|
|
|
c.lib_name LIKE concat ('%',#{name},'%')
|
|
|
- AND c.lib_type = #{endType} order by c.gmt_modified desc
|
|
|
+ AND c.lib_type = #{endType}
|
|
|
)
|
|
|
) s
|
|
|
where 1 = 1
|
|
@@ -59,6 +55,6 @@
|
|
|
#{item}
|
|
|
</foreach>
|
|
|
</if>
|
|
|
- ORDER BY s.orderNo ASC
|
|
|
+
|
|
|
</select>
|
|
|
</mapper>
|