|
@@ -259,7 +259,7 @@
|
|
</choose>
|
|
</choose>
|
|
</if>
|
|
</if>
|
|
<if test="queryPage.keyword != null and queryPage.keyword != ''">
|
|
<if test="queryPage.keyword != null and queryPage.keyword != ''">
|
|
- and CONCAT(IFNULL(info.device_name, ''), IFNULL(info.device_id, '')) LIKE CONCAT('%',#{keyword},'%')
|
|
|
|
|
|
+ and CONCAT(IFNULL(info.device_name, ''), IFNULL(info.device_id, '')) LIKE CONCAT('%',#{queryPage.keyword},'%')
|
|
</if>
|
|
</if>
|
|
<if test="queryPage.showStatus != null">
|
|
<if test="queryPage.showStatus != null">
|
|
and info.show_status = #{queryPage.showStatus}
|
|
and info.show_status = #{queryPage.showStatus}
|