From a07a0fe6ed6e7f9c19c5554bd545ddd94b9f5d51 Mon Sep 17 00:00:00 2001
From: xy <748613696@qq.com>
Date: Tue, 14 Jul 2026 11:10:46 +0800
Subject: [PATCH] =?UTF-8?q?fix(search):=20=E4=BC=98=E5=8C=96=E4=BA=8B?=
 =?UTF-8?q?=E4=BB=B6=E7=94=A8=E6=88=B7=E6=9F=A5=E8=AF=A2=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 修改CsEventUserPOMapper.xml中的搜索条件，同时支持名称和代码字段的模糊匹配
- 修复CsEventUserPOServiceImpl中线路ID判断逻辑，避免空字符串和null值导致的异常
- 调整MqttMessageHandler中消息发送的缩进格式，确保代码风格一致
---
 .../java/com/njcn/csharmonic/handler/MqttMessageHandler.java | 2 +-
 .../njcn/csharmonic/mapper/mapping/CsEventUserPOMapper.xml   | 5 +++--
 .../csharmonic/service/impl/CsEventUserPOServiceImpl.java    | 3 +--
 3 files changed, 5 insertions(+), 5 deletions(-)

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())