diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMarkMapper.xml b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMarkMapper.xml index 3fbacdd20..ff9832eac 100644 --- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMarkMapper.xml +++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMarkMapper.xml @@ -31,19 +31,23 @@ AND line.id = lineDetail.id AND dev.id = devDetail.id AND prov.NAME = area.id - AND lineDetail.line_grade = dic.id and devDetail.dev_model = 1 and devDetail.com_flag = #{comFlag} - and dic.id = #{lineGrade} + and lineDetail.line_grade = #{lineGrade} - and area.name like CONCAT(CONCAT('%', #{searchValue}), '%') or gd.name like CONCAT(CONCAT('%', #{searchValue}), '%') - or sub.name like CONCAT(CONCAT('%', #{searchValue}), '%') or dev.name like CONCAT(CONCAT('%', #{searchValue}), '%') - or voltage.name like CONCAT(CONCAT('%', #{searchValue}), '%') or line.name like CONCAT(CONCAT('%', #{searchValue}), '%') + and ( + area.name like CONCAT('%', #{searchValue}, '%') + or gd.name like CONCAT('%', #{searchValue}, '%') + or sub.name like CONCAT('%', #{searchValue}, '%') + or dev.name like CONCAT('%', #{searchValue}, '%') + or voltage.name like CONCAT('%', #{searchValue}, '%') + or line.name like CONCAT('%', #{searchValue}, '%') + ) order by prov.sort asc,gd.sort asc,sub.sort asc,dev.sort asc,line.sort asc