From fd04c21997dbeb008b2b5db97bf17bd6d2a2a776 Mon Sep 17 00:00:00 2001
From: hzj <826100833@qq.com>
Date: Tue, 10 Feb 2026 09:22:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A9=BE=E9=A9=B6=E8=88=B1bu?=
 =?UTF-8?q?g?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../device/pq/service/impl/PqDataVerifyBakServiceImpl.java  | 4 ++++
 .../njcn/system/mapper/mapping/PqDashboardPageMapper.xml    | 1 +
 .../system/service/impl/PqDashboardPageServiceImpl.java     | 6 +++---
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/PqDataVerifyBakServiceImpl.java b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/PqDataVerifyBakServiceImpl.java
index 6024a3098..7f7b96849 100644
--- a/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/PqDataVerifyBakServiceImpl.java
+++ b/pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/PqDataVerifyBakServiceImpl.java
@@ -50,6 +50,7 @@ import com.njcn.system.api.DictTreeFeignClient;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
@@ -196,6 +197,9 @@ public class PqDataVerifyBakServiceImpl extends ServiceImpl<PqDataVerifyBakMappe
     @Override
     public List<PowerQualityIndicatorsVO> getMonitorVerifyDay(MonitorBaseParam monitorBaseParam) {
         List<String> monitorIds = commTerminalService.getRunMonitorByDept(monitorBaseParam);
+        if(CollectionUtils.isEmpty(monitorIds)){
+            return new ArrayList<>();
+        }
         List<PqDataVerifyBak> dataVerifyList = baseDataVerifyQuery(monitorIds, monitorBaseParam);
         return getAbnormalTable(dataVerifyList, monitorBaseParam);
     }
diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/PqDashboardPageMapper.xml b/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/PqDashboardPageMapper.xml
index 6ad9e483e..24b8f7ea7 100644
--- a/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/PqDashboardPageMapper.xml
+++ b/pqs-system/system-boot/src/main/java/com/njcn/system/mapper/mapping/PqDashboardPageMapper.xml
@@ -30,5 +30,6 @@
     <where>
        ${ew.sqlSegment}
     </where>
+    order by A.sort asc
   </select>
 </mapper>
diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/PqDashboardPageServiceImpl.java b/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/PqDashboardPageServiceImpl.java
index 25badd71a..94ff01f18 100644
--- a/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/PqDashboardPageServiceImpl.java
+++ b/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/PqDashboardPageServiceImpl.java
@@ -71,10 +71,10 @@ public class PqDashboardPageServiceImpl extends ServiceImpl<PqDashboardPageMappe
         if (Objects.nonNull(param.getSearchBeginTime()) && Objects.nonNull(param.getSearchEndTime())) {
             queryWrapper.between("A.Create_Time", param.getSearchBeginTime(), param.getSearchEndTime());
         }
-        if(Objects.nonNull(param.getPageName())){
-            queryWrapper.like("A.page_name",param.getPageName());
+        if(Objects.nonNull(param.getSearchValue())){
+            queryWrapper.like("A.page_name",param.getSearchValue());
         }
-        queryWrapper.orderByAsc("A.sort");
+//        queryWrapper.orderByAsc("A.sort");
         return this.baseMapper.page(new Page<>(PageFactory.getPageNum(param), PageFactory.getPageSize(param)), queryWrapper);
     }