From a88d5237ecea000af7496a217f65033570fa50bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9B=A8=E6=9C=A8c?= <857448963@qq.com>
Date: Sat, 6 May 2023 14:28:16 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9B=91=E6=B5=8B=E7=82=B9=E8=AF=84=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../device/pq/mapper/mapping/LineMarkMapper.xml | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
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