|
@@ -222,7 +222,7 @@
|
|
|
#{id}
|
|
|
</foreach>
|
|
|
</if>
|
|
|
- AND (t2.spell = UPPER(#{InputStr}) OR t2.name = #{InputStr})
|
|
|
+ AND (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(#{InputStr}),'%') OR t2.name LIKE CONCAT( #{InputStr},'%'))
|
|
|
+ AND (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(#{InputStr}),'%') OR t2.name LIKE CONCAT('%',#{InputStr},'%'))
|
|
|
+ AND (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(#{InputStr}) OR t2.name = #{InputStr})
|
|
|
+ AND (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(#{InputStr}),'%') OR t2.name LIKE CONCAT( #{InputStr},'%'))
|
|
|
+ AND (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(#{InputStr}),'%') OR t2.name LIKE CONCAT('%',#{InputStr},'%'))
|
|
|
+ AND (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=")">
|
|
@@ -474,7 +474,7 @@
|
|
|
</foreach>
|
|
|
AND (
|
|
|
t2.spell = UPPER(#{InputStr})
|
|
|
- OR t2. NAME = (#{InputStr})
|
|
|
+ OR UPPER(TRIM(t2. NAME)) = UPPER((TRIM(#{InputStr})))
|
|
|
)
|
|
|
) b1
|
|
|
)
|
|
@@ -531,7 +531,7 @@
|
|
|
</foreach>
|
|
|
AND (
|
|
|
t2.spell LIKE CONCAT(UPPER(#{InputStr}), '%')
|
|
|
- OR t2. NAME LIKE CONCAT((#{InputStr}), '%')
|
|
|
+ OR UPPER(t2. NAME) LIKE CONCAT(UPPER(TRIM(#{InputStr})), '%')
|
|
|
)
|
|
|
) b1
|
|
|
)
|
|
@@ -588,7 +588,7 @@
|
|
|
</foreach>
|
|
|
AND (
|
|
|
t2.spell LIKE CONCAT('%', UPPER(#{InputStr}), '%')
|
|
|
- OR t2. NAME LIKE CONCAT('%',(#{InputStr}), '%')
|
|
|
+ OR UPPER(t2. NAME) LIKE CONCAT('%',UPPER(TRIM(#{InputStr})), '%')
|
|
|
)
|
|
|
) b1
|
|
|
)
|
|
@@ -631,7 +631,7 @@
|
|
|
AND t1.lib_type = 12
|
|
|
AND (
|
|
|
t2.spell = UPPER(#{InputStr})
|
|
|
- OR t2. NAME = (#{InputStr})
|
|
|
+ OR UPPER(t2. NAME) = UPPER(TRIM(#{InputStr}))
|
|
|
)
|
|
|
) b1,
|
|
|
kl_concept b2,
|
|
@@ -681,7 +681,7 @@
|
|
|
AND t1.lib_type = 12
|
|
|
AND (
|
|
|
t2.spell LIKE CONCAT(UPPER(#{InputStr}), '%')
|
|
|
- OR t2. NAME LIKE CONCAT((#{InputStr}), '%')
|
|
|
+ OR UPPER(t2. NAME) LIKE CONCAT(UPPER(TRIM(#{InputStr})), '%')
|
|
|
)
|
|
|
) b1,
|
|
|
kl_concept b2,
|
|
@@ -731,7 +731,7 @@
|
|
|
AND t1.lib_type = 12
|
|
|
AND (
|
|
|
t2.spell LIKE CONCAT('%', UPPER(#{InputStr}), '%')
|
|
|
- OR t2. NAME LIKE CONCAT('%',(#{InputStr}), '%')
|
|
|
+ OR UPPER(t2. NAME) LIKE CONCAT('%',UPPER(TRIM(#{InputStr})), '%')
|
|
|
)
|
|
|
) b1,
|
|
|
kl_concept b2,
|
|
@@ -787,7 +787,7 @@
|
|
|
AND t1.lib_type = 13
|
|
|
AND (
|
|
|
t2.spell = UPPER(#{InputStr})
|
|
|
- OR t2. NAME = #{InputStr}
|
|
|
+ OR UPPER(t2. NAME) = UPPER(TRIM(#{InputStr}))
|
|
|
)
|
|
|
AND t4.relation_id = 18
|
|
|
) b1,
|
|
@@ -844,7 +844,7 @@
|
|
|
AND t1.lib_type = 13
|
|
|
AND (
|
|
|
t2.spell LIKE CONCAT(UPPER(#{InputStr}), '%')
|
|
|
- OR t2. NAME LIKE CONCAT(#{InputStr}, '%')
|
|
|
+ OR UPPER(t2. NAME) LIKE CONCAT(UPPER(TRIM(#{InputStr})), '%')
|
|
|
)
|
|
|
AND t4.relation_id = 18
|
|
|
) b1,
|
|
@@ -901,7 +901,7 @@
|
|
|
AND t1.lib_type = 13
|
|
|
AND (
|
|
|
t2.spell LIKE CONCAT('%', UPPER(#{InputStr}), '%')
|
|
|
- OR t2. NAME LIKE CONCAT('%', #{InputStr}, '%')
|
|
|
+ OR UPPER(t2. NAME) LIKE CONCAT('%', UPPER(TRIM(#{InputStr})), '%')
|
|
|
)
|
|
|
AND t4.relation_id = 18
|
|
|
) b1,
|
|
@@ -958,7 +958,7 @@
|
|
|
AND t1.lib_type = 13
|
|
|
AND (
|
|
|
t2.spell = UPPER(#{InputStr})
|
|
|
- OR t2. NAME = #{InputStr}
|
|
|
+ OR UPPER(t2. NAME) = UPPER(TRIM(#{InputStr}))
|
|
|
)
|
|
|
AND t4.relation_id = 18
|
|
|
) b1,
|
|
@@ -1015,7 +1015,7 @@
|
|
|
AND t1.lib_type = 13
|
|
|
AND (
|
|
|
t2.spell LIKE CONCAT(UPPER(#{InputStr}), '%')
|
|
|
- OR t2. NAME LIKE CONCAT(#{InputStr}, '%')
|
|
|
+ OR UPPER(t2. NAME) LIKE CONCAT(UPPER(TRIM(#{InputStr})), '%')
|
|
|
)
|
|
|
AND t4.relation_id = 18
|
|
|
) b1,
|
|
@@ -1072,7 +1072,7 @@
|
|
|
AND t1.lib_type = 13
|
|
|
AND (
|
|
|
t2.spell LIKE CONCAT('%', UPPER(#{InputStr}), '%')
|
|
|
- OR t2. NAME LIKE CONCAT('%', #{InputStr}, '%')
|
|
|
+ OR UPPER(t2. NAME) LIKE CONCAT('%', UPPER(TRIM(#{InputStr})), '%')
|
|
|
)
|
|
|
AND t4.relation_id = 18
|
|
|
) b1,
|