Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
c53ff7bfd9
|
|
@ -85,14 +85,14 @@
|
|||
and pt.name like concat('%',#{model},'%')
|
||||
</if>
|
||||
ORDER BY CASE
|
||||
WHEN pt.nam REGEXP '^[0-9]+$' THEN 1
|
||||
WHEN pt.`name` REGEXP '^[0-9]+$' THEN 1
|
||||
ELSE 0
|
||||
END,
|
||||
CASE
|
||||
WHEN pt.nam REGEXP '^[0-9]+$' THEN CAST(pt.nam AS UNSIGNED)
|
||||
WHEN pt.`name` REGEXP '^[0-9]+$' THEN CAST(pt.`name` AS UNSIGNED)
|
||||
ELSE NULL
|
||||
END,
|
||||
pt.nam ASC
|
||||
pt.`name` ASC
|
||||
</select>
|
||||
|
||||
<select id="getVendList" resultType="com.bonus.gzgqj.business.bases.entity.VendVo">
|
||||
|
|
|
|||
Loading…
Reference in New Issue