diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/handler/MqttMessageHandler.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/handler/MqttMessageHandler.java
index b7a566e..e63a26f 100644
--- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/handler/MqttMessageHandler.java
+++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/handler/MqttMessageHandler.java
@@ -75,7 +75,7 @@ public class MqttMessageHandler {
     public void responseRtData(String topic, @NamedValue("pageId") String pageId, MqttMessage message, @Payload String payload) {
         List<CsRtDataVO> list = lineTargetService.getLineData(pageId);
         Gson gson = new Gson();
-            publisher.send("/zl/rtData/" + pageId, gson.toJson(list), 1, false);
+        publisher.send("/zl/rtData/" + pageId, gson.toJson(list), 1, false);
     }
 
     @MqttSubscribe(value = "/zl/askTemperData/{devId}", qos = 1)
diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/mapper/mapping/CsEventUserPOMapper.xml b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/mapper/mapping/CsEventUserPOMapper.xml
index 313e310..4efabf7 100644
--- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/mapper/mapping/CsEventUserPOMapper.xml
+++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/mapper/mapping/CsEventUserPOMapper.xml
@@ -228,7 +228,7 @@
       <!-- 名称匹配（根据type区分线路名/设备名） -->
       <choose>
         <when test="csEventUserQueryPage.type != null and csEventUserQueryPage.type == 3">
-          e.name LIKE CONCAT('%', #{csEventUserQueryPage.searchValue}, '%')
+          (e.name LIKE CONCAT('%', #{csEventUserQueryPage.searchValue}, '%') OR b.code LIKE CONCAT('%', #{csEventUserQueryPage.searchValue}, '%'))
         </when>
         <otherwise>
           d.name LIKE CONCAT('%', #{csEventUserQueryPage.searchValue}, '%')
@@ -338,7 +338,8 @@
     </if>
     <if test="csEventUserQueryPage!=null and csEventUserQueryPage.searchValue  != null and csEventUserQueryPage.searchValue !=''">
       <if test="csEventUserQueryPage.type != null and csEventUserQueryPage.type !='' and csEventUserQueryPage.type == 3 ">
-        AND e.name like concat('%',#{csEventUserQueryPage.searchValue},'%')
+--         AND e.name like concat('%',#{csEventUserQueryPage.searchValue},'%')
+        AND (e.name LIKE CONCAT('%', #{csEventUserQueryPage.searchValue}, '%') OR b.code LIKE CONCAT('%', #{csEventUserQueryPage.searchValue}, '%'))
       </if>
       <if test="csEventUserQueryPage.type != null and csEventUserQueryPage.type !='' and csEventUserQueryPage.type != 3 ">
         AND d.name like concat('%',#{csEventUserQueryPage.searchValue},'%')
diff --git a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsEventUserPOServiceImpl.java b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsEventUserPOServiceImpl.java
index 7945ce8..f31f4de 100644
--- a/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsEventUserPOServiceImpl.java
+++ b/cs-harmonic/cs-harmonic-boot/src/main/java/com/njcn/csharmonic/service/impl/CsEventUserPOServiceImpl.java
@@ -419,8 +419,7 @@ public class CsEventUserPOServiceImpl extends ServiceImpl<CsEventUserPOMapper, C
                 List<String> portableDevIds = new ArrayList<>();
                 if (Objects.equals(csEventUserQueryPage.getEngineeringid(),"1")
                         || Objects.equals(csEventUserQueryPage.getProjectId(),"2")
-                        || !ObjectUtil.isNull(csEventUserQueryPage.getLineId())
-                        || !StringUtils.isEmpty(csEventUserQueryPage.getLineId())) {
+                        || (!ObjectUtil.isNull(csEventUserQueryPage.getLineId()) && !StringUtils.isEmpty(csEventUserQueryPage.getLineId()))) {
                     portableDevIds = portableDevTree.stream().map(CsLedgerVO::getId).filter(
                             id -> StringUtils.isEmpty(csEventUserQueryPage.getDeviceId()) ||
                                     Objects.equals(id, csEventUserQueryPage.getDeviceId())