|
|
@@ -222,7 +222,7 @@
|
|
|
#{id}
|
|
|
</foreach>
|
|
|
</if>
|
|
|
- AND (t2.spell = UPPER(TRIM(#{InputStr})) OR UPPER(t2.name) = UPPER(TRIM(#{InputStr})))
|
|
|
+ AND (UPPER(t2.spell) = UPPER(TRIM(#{InputStr})) OR UPPER(t2.name) = UPPER(TRIM(#{InputStr})))
|
|
|
LIMIT 100)
|
|
|
UNION
|
|
|
(SELECT t1.id selfId,t1.lib_name selfName,0 parentId,null parentName,t2.`name` sameName,t2.is_concept showType,t1.lib_type libTypeId,t6.`name` libTypeName FROM kl_concept t1
|
|
|
@@ -259,7 +259,7 @@
|
|
|
#{id}
|
|
|
</foreach>
|
|
|
</if>
|
|
|
- AND (t2.spell LIKE CONCAT( UPPER(TRIM(#{InputStr})),'%') OR UPPER(t2.name) LIKE CONCAT( UPPER(TRIM(#{InputStr})),'%'))
|
|
|
+ AND (UPPER(t2.spell) LIKE CONCAT( UPPER(TRIM(#{InputStr})),'%') OR UPPER(t2.name) LIKE CONCAT( UPPER(TRIM(#{InputStr})),'%'))
|
|
|
LIMIT 100)
|
|
|
UNION
|
|
|
(SELECT t1.id selfId,t1.lib_name selfName,0 parentId,null parentName,t2.`name` sameName,t2.is_concept showType,t1.lib_type libTypeId,t6.`name` libTypeName FROM kl_concept t1
|
|
|
@@ -296,7 +296,7 @@
|
|
|
#{id}
|
|
|
</foreach>
|
|
|
</if>
|
|
|
- AND (t2.spell LIKE CONCAT('%',UPPER(TRIM(#{InputStr})),'%') OR UPPER(t2.name) LIKE CONCAT('%',UPPER(TRIM(#{InputStr})),'%'))
|
|
|
+ AND (UPPER(t2.spell) LIKE CONCAT('%',UPPER(TRIM(#{InputStr})),'%') OR UPPER(t2.name) LIKE CONCAT('%',UPPER(TRIM(#{InputStr})),'%'))
|
|
|
LIMIT 100)
|
|
|
<if test="detailType != null and detailType != ''">
|
|
|
UNION
|
|
|
@@ -326,7 +326,7 @@
|
|
|
AND <![CDATA[ t3.min_age <= #{age} ]]>
|
|
|
AND <![CDATA[ t3.max_age >= #{age} ]]>
|
|
|
</if>
|
|
|
- AND (t2.spell = UPPER(TRIM(#{InputStr})) OR UPPER(t2.name) = UPPER(TRIM(#{InputStr})))
|
|
|
+ AND (UPPER(t2.spell) = UPPER(TRIM(#{InputStr})) OR UPPER(t2.name) = UPPER(TRIM(#{InputStr})))
|
|
|
<if test="inputIds != null and inputIds.size > 0">
|
|
|
and t1.id not in
|
|
|
<foreach item="id" collection="inputIds" open="(" separator="," close=")">
|
|
|
@@ -362,7 +362,7 @@
|
|
|
AND <![CDATA[ t3.min_age <= #{age} ]]>
|
|
|
AND <![CDATA[ t3.max_age >= #{age} ]]>
|
|
|
</if>
|
|
|
- AND (t2.spell LIKE CONCAT(UPPER(TRIM(#{InputStr})),'%') OR UPPER(t2.name) LIKE CONCAT( UPPER(TRIM(#{InputStr})),'%'))
|
|
|
+ AND (UPPER(t2.spell) LIKE CONCAT(UPPER(TRIM(#{InputStr})),'%') OR UPPER(t2.name) LIKE CONCAT( UPPER(TRIM(#{InputStr})),'%'))
|
|
|
<if test="inputIds != null and inputIds.size > 0">
|
|
|
and t1.id not in
|
|
|
<foreach item="id" collection="inputIds" open="(" separator="," close=")">
|
|
|
@@ -401,7 +401,7 @@
|
|
|
AND <![CDATA[ t3.min_age <= #{age} ]]>
|
|
|
AND <![CDATA[ t3.max_age >= #{age} ]]>
|
|
|
</if>
|
|
|
- AND (t2.spell LIKE CONCAT('%',UPPER(TRIM(#{InputStr})),'%') OR UPPER(t2.name) LIKE CONCAT('%',UPPER(TRIM(#{InputStr})),'%'))
|
|
|
+ AND (UPPER(t2.spell) LIKE CONCAT('%',UPPER(TRIM(#{InputStr})),'%') OR UPPER(t2.name) LIKE CONCAT('%',UPPER(TRIM(#{InputStr})),'%'))
|
|
|
<if test="inputIds != null and inputIds.size > 0">
|
|
|
and t1.id not in
|
|
|
<foreach item="id" collection="inputIds" open="(" separator="," close=")">
|
|
|
@@ -473,7 +473,7 @@
|
|
|
#{item}
|
|
|
</foreach>
|
|
|
AND (
|
|
|
- t2.spell = UPPER(#{InputStr})
|
|
|
+ UPPER(t2.spell) = UPPER(#{InputStr})
|
|
|
OR UPPER(TRIM(t2. NAME)) = UPPER((TRIM(#{InputStr})))
|
|
|
)
|
|
|
) b1
|
|
|
@@ -530,7 +530,7 @@
|
|
|
#{item}
|
|
|
</foreach>
|
|
|
AND (
|
|
|
- t2.spell LIKE CONCAT(UPPER(#{InputStr}), '%')
|
|
|
+ UPPER(t2.spell) LIKE CONCAT(UPPER(#{InputStr}), '%')
|
|
|
OR UPPER(t2. NAME) LIKE CONCAT(UPPER(TRIM(#{InputStr})), '%')
|
|
|
)
|
|
|
) b1
|
|
|
@@ -587,7 +587,7 @@
|
|
|
#{item}
|
|
|
</foreach>
|
|
|
AND (
|
|
|
- t2.spell LIKE CONCAT('%', UPPER(#{InputStr}), '%')
|
|
|
+ UPPER(t2.spell) LIKE CONCAT('%', UPPER(#{InputStr}), '%')
|
|
|
OR UPPER(t2. NAME) LIKE CONCAT('%',UPPER(TRIM(#{InputStr})), '%')
|
|
|
)
|
|
|
) b1
|
|
|
@@ -630,7 +630,7 @@
|
|
|
AND t6.is_deleted = 'N'
|
|
|
AND t1.lib_type = 12
|
|
|
AND (
|
|
|
- t2.spell = UPPER(#{InputStr})
|
|
|
+ UPPER(t2.spell) = UPPER(#{InputStr})
|
|
|
OR UPPER(t2. NAME) = UPPER(TRIM(#{InputStr}))
|
|
|
)
|
|
|
) b1,
|
|
|
@@ -680,7 +680,7 @@
|
|
|
AND t6.is_deleted = 'N'
|
|
|
AND t1.lib_type = 12
|
|
|
AND (
|
|
|
- t2.spell LIKE CONCAT(UPPER(#{InputStr}), '%')
|
|
|
+ UPPER(t2.spell) LIKE CONCAT(UPPER(#{InputStr}), '%')
|
|
|
OR UPPER(t2. NAME) LIKE CONCAT(UPPER(TRIM(#{InputStr})), '%')
|
|
|
)
|
|
|
) b1,
|
|
|
@@ -730,7 +730,7 @@
|
|
|
AND t6.is_deleted = 'N'
|
|
|
AND t1.lib_type = 12
|
|
|
AND (
|
|
|
- t2.spell LIKE CONCAT('%', UPPER(#{InputStr}), '%')
|
|
|
+ UPPER(t2.spell) LIKE CONCAT('%', UPPER(#{InputStr}), '%')
|
|
|
OR UPPER(t2. NAME) LIKE CONCAT('%',UPPER(TRIM(#{InputStr})), '%')
|
|
|
)
|
|
|
) b1,
|
|
|
@@ -786,7 +786,7 @@
|
|
|
AND t6.is_deleted = 'N'
|
|
|
AND t1.lib_type = 13
|
|
|
AND (
|
|
|
- t2.spell = UPPER(#{InputStr})
|
|
|
+ UPPER(t2.spell) = UPPER(#{InputStr})
|
|
|
OR UPPER(t2. NAME) = UPPER(TRIM(#{InputStr}))
|
|
|
)
|
|
|
AND t4.relation_id = 18
|
|
|
@@ -843,7 +843,7 @@
|
|
|
AND t6.is_deleted = 'N'
|
|
|
AND t1.lib_type = 13
|
|
|
AND (
|
|
|
- t2.spell LIKE CONCAT(UPPER(#{InputStr}), '%')
|
|
|
+ UPPER(t2.spell) LIKE CONCAT(UPPER(#{InputStr}), '%')
|
|
|
OR UPPER(t2. NAME) LIKE CONCAT(UPPER(TRIM(#{InputStr})), '%')
|
|
|
)
|
|
|
AND t4.relation_id = 18
|
|
|
@@ -900,7 +900,7 @@
|
|
|
AND t6.is_deleted = 'N'
|
|
|
AND t1.lib_type = 13
|
|
|
AND (
|
|
|
- t2.spell LIKE CONCAT('%', UPPER(#{InputStr}), '%')
|
|
|
+ UPPER(t2.spell) LIKE CONCAT('%', UPPER(#{InputStr}), '%')
|
|
|
OR UPPER(t2. NAME) LIKE CONCAT('%', UPPER(TRIM(#{InputStr})), '%')
|
|
|
)
|
|
|
AND t4.relation_id = 18
|
|
|
@@ -957,7 +957,7 @@
|
|
|
AND t6.is_deleted = 'N'
|
|
|
AND t1.lib_type = 13
|
|
|
AND (
|
|
|
- t2.spell = UPPER(#{InputStr})
|
|
|
+ UPPER(t2.spell) = UPPER(#{InputStr})
|
|
|
OR UPPER(t2. NAME) = UPPER(TRIM(#{InputStr}))
|
|
|
)
|
|
|
AND t4.relation_id = 18
|
|
|
@@ -1014,7 +1014,7 @@
|
|
|
AND t6.is_deleted = 'N'
|
|
|
AND t1.lib_type = 13
|
|
|
AND (
|
|
|
- t2.spell LIKE CONCAT(UPPER(#{InputStr}), '%')
|
|
|
+ UPPER(t2.spell) LIKE CONCAT(UPPER(#{InputStr}), '%')
|
|
|
OR UPPER(t2. NAME) LIKE CONCAT(UPPER(TRIM(#{InputStr})), '%')
|
|
|
)
|
|
|
AND t4.relation_id = 18
|
|
|
@@ -1071,7 +1071,7 @@
|
|
|
AND t6.is_deleted = 'N'
|
|
|
AND t1.lib_type = 13
|
|
|
AND (
|
|
|
- t2.spell LIKE CONCAT('%', UPPER(#{InputStr}), '%')
|
|
|
+ UPPER(t2.spell) LIKE CONCAT('%', UPPER(#{InputStr}), '%')
|
|
|
OR UPPER(t2. NAME) LIKE CONCAT('%', UPPER(TRIM(#{InputStr})), '%')
|
|
|
)
|
|
|
AND t4.relation_id = 18
|
zhoutg