From cda4991428184a77dcfc7ae45c70080763315f0f Mon Sep 17 00:00:00 2001
From: zhangyue <82248909@qq.com>
Date: Wed, 12 Aug 2026 17:44:33 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A9=BA=E6=B0=94=E6=8A=A5=E9=94=99bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/appmana/controller/SurvHisdataAirController.java | 5 ++---
 .../appmana/controller/SurvTransdataAirController.java       | 5 ++---
 .../appmana/service/impl/SurvHisdataAirServiceImpl.java      | 4 ++--
 .../appmana/service/impl/SurvTransdataAirServiceImpl.java    | 2 +-
 4 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/SurvHisdataAirController.java b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/SurvHisdataAirController.java
index bd66590..27cd287 100644
--- a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/SurvHisdataAirController.java
+++ b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/SurvHisdataAirController.java
@@ -63,9 +63,8 @@ public class SurvHisdataAirController extends JeecgController<SurvHisdataAir, IS
 		List<String> deviceList = new ArrayList<>();
 		if(StringUtils.isNotBlank(survHisdataAir.getStationCode())){
 			deviceList = deployService.getDeviceListByStation(survHisdataAir.getStationCode(), PollutionConstants.AIR_SURV);
-			if(deviceList.size() ==0){//如果没有此类设备，则返回空
-				IPage emptyPage = new Page(1,1);
-				return Result.OK(emptyPage);
+			if(deviceList.isEmpty()){//如果没有此类设备，则返回空
+				return Result.OK(new Page<>(pageNo,pageSize));
 			}
 		}
 		IPage<SurvHisdataAir> pageList = survHisdataAirService.pages(page, survHisdataAir,deviceList);
diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/SurvTransdataAirController.java b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/SurvTransdataAirController.java
index 8a20b62..e9e8297 100644
--- a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/SurvTransdataAirController.java
+++ b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/SurvTransdataAirController.java
@@ -63,9 +63,8 @@ public class SurvTransdataAirController extends JeecgController<SurvTransdataAir
 		List<String> deviceList = new ArrayList<>();
 		if(StringUtils.isNotBlank(survTransdataAir.getStationCode())) {
 			deviceList = deployService.getDeviceListByStation(survTransdataAir.getStationCode(), PollutionConstants.AIR_SURV);
-			if (deviceList.size() == 0) {//如果没有此类设备，则返回空
-				IPage emptyPage = new Page(1,1);
-				return Result.OK(emptyPage);
+			if (deviceList.isEmpty()) {//如果没有此类设备，则返回空
+				return Result.OK(new Page<>(pageNo,pageSize));
 			}
 		}
 		IPage<SurvTransdataAir> pageList = survTransdataAirService.pages(page, survTransdataAir,deviceList);
diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/SurvHisdataAirServiceImpl.java b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/SurvHisdataAirServiceImpl.java
index 0afd7fc..56a8d39 100644
--- a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/SurvHisdataAirServiceImpl.java
+++ b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/SurvHisdataAirServiceImpl.java
@@ -44,7 +44,7 @@ public class SurvHisdataAirServiceImpl extends ServiceImpl<SurvHisdataAirMapper,
         }
         survHisdataAir.setDeployList(deployList);
         IPage<SurvHisdataAir> p = baseMapper.pages(page,survHisdataAir,deviceList);
-        fill(p.getRecords());
+//        fill(p.getRecords());
         return p;
     }
 
@@ -56,7 +56,7 @@ public class SurvHisdataAirServiceImpl extends ServiceImpl<SurvHisdataAirMapper,
     @Override
     public List<SurvHisdataAir> listByParams(String deployCode, LocalDateTime startDateTime, LocalDateTime endDateTime) {
         List<SurvHisdataAir> l = baseMapper.listByParams(deployCode,startDateTime,endDateTime);
-        fill(l);
+//        fill(l);
         return l;
     }
 
diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/SurvTransdataAirServiceImpl.java b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/SurvTransdataAirServiceImpl.java
index eb334e0..a677e62 100644
--- a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/SurvTransdataAirServiceImpl.java
+++ b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/SurvTransdataAirServiceImpl.java
@@ -48,7 +48,7 @@ public class SurvTransdataAirServiceImpl extends ServiceImpl<SurvTransdataAirMap
         }
         survTransdataAir.setDeployList(deployList);
         IPage<SurvTransdataAir> p = baseMapper.pages(page,survTransdataAir,deviceList);
-        fill(p.getRecords());
+//        fill(p.getRecords());
         return p;
     }