|
@@ -98,7 +98,7 @@
|
|
|
</resultMap>
|
|
|
|
|
|
<select id="listByAdminName" resultType="com.xy.dto.DeviceInfoDto$ListByAdminName">
|
|
|
- SELECT d.device_id, d.device_name, p.admin_name, d.device_type
|
|
|
+ SELECT d.device_id, d.device_name, p.admin_name, d.device_type,d.algorithm_id
|
|
|
FROM device_info d
|
|
|
left join merc_place p on p.id = d.place_id
|
|
|
<where>
|
|
@@ -113,6 +113,9 @@
|
|
|
<if test="dto.searchKey != null and dto.searchKey != ''">
|
|
|
and CONCAT(IFNULL(d.device_name, ''), IFNULL(p.admin_name, '')) like CONCAT('%', #{dto.searchKey}, '%')
|
|
|
</if>
|
|
|
+ <if test="dto.algorithmId != null">
|
|
|
+ and d.algorithm_id = #{dto.algorithmId}
|
|
|
+ </if>
|
|
|
</where>
|
|
|
</select>
|
|
|
|