1.调整终端管理下，终端和监测点模糊搜索bug

pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/mapper/mapping/LineMapper.xml

@@ -1646,7 +1646,6 @@
                 AND device.id = deviceDetail.id
                 AND line.id = lineDetail.id
                 AND vg.Id = voltage.id
-
         <if test="ids!=null and ids.size() > 0">
             AND line.id IN
             <foreach collection="ids" item="item" open="(" close=")" separator=",">
@@ -1655,16 +1654,16 @@
         </if>
         <if test="searchValue!=null and searchValue!='' and type==2">
             and (
-            lineName like CONCAT('%', #{searchValue}, '%')
-            or subName like CONCAT('%', #{searchValue}, '%')
+                line.NAME like CONCAT('%', #{searchValue}, '%')
+                or substation.NAME like CONCAT('%', #{searchValue}, '%')
+            )
+        </if>
+        <if test="searchValue!=null and searchValue!='' and type==1">
+            and (
+                device.NAME like CONCAT('%', #{searchValue}, '%')
+                or substation.NAME like CONCAT('%', #{searchValue}, '%')
             )
         </if>
-            <if test="searchValue!=null and searchValue!='' and type==1">
-                and (
-                devName like CONCAT('%', #{searchValue}, '%')
-                or subName like CONCAT('%', #{searchValue}, '%')
-                )
-            </if>
         </where>
     </select>