|
|
@@ -153,8 +153,7 @@
|
|
|
</if>
|
|
|
<if test="queryPage.deviceIdName != null and queryPage.deviceIdName != ''">
|
|
|
and (
|
|
|
- LOCATE(#{queryPage.deviceIdName}, info.device_id) > 0 or LOCATE(#{queryPage.deviceIdName}, info.device_name)
|
|
|
- > 0
|
|
|
+ LOCATE(#{queryPage.deviceIdName}, info.device_id) > 0 or LOCATE(#{queryPage.deviceIdName}, info.device_name) > 0
|
|
|
)
|
|
|
</if>
|
|
|
<if test="queryPage.deviceId != null">
|
|
|
@@ -172,8 +171,7 @@
|
|
|
</if>
|
|
|
<if test="queryPage.no != null and queryPage.no != ''">
|
|
|
and (
|
|
|
- LOCATE(#{queryPage.no}, info.merc_device_code) > 0 or LOCATE(#{queryPage.no}, sysinfo.device_sn) > 0or
|
|
|
- LOCATE(#{queryPage.no}, sysinfo.sim_iccid) > 0
|
|
|
+ LOCATE(#{queryPage.no}, info.merc_device_code) > 0 or LOCATE(#{queryPage.no}, sysinfo.device_sn) > 0 or LOCATE(#{queryPage.no}, sysinfo.sim_iccid) > 0
|
|
|
)
|
|
|
</if>
|
|
|
<if test="queryPage.activeState != null">
|
|
|
@@ -205,8 +203,7 @@
|
|
|
</if>
|
|
|
<if test="queryPage.merc != null and queryPage.merc != ''">
|
|
|
and (
|
|
|
- info.merc_id = #{queryPage.merc} or info.merc_code = #{queryPage.merc} or LOCATE(#{queryPage.merc}, mr.name)
|
|
|
- > 0
|
|
|
+ info.merc_id = #{queryPage.merc} or info.merc_code = #{queryPage.merc} or LOCATE(#{queryPage.merc}, mr.name) > 0
|
|
|
)
|
|
|
</if>
|
|
|
<if test="queryPage.placeId != null">
|
|
|
@@ -246,7 +243,7 @@
|
|
|
order by `m` asc
|
|
|
</when>
|
|
|
<otherwise>
|
|
|
- order by create_time desc
|
|
|
+ order by info.create_time desc
|
|
|
</otherwise>
|
|
|
</choose>
|
|
|
</select>
|
