From 0d4da4e4381cab3bb3f91dadf35817636e0ba445 Mon Sep 17 00:00:00 2001
From: zy <82248909@qq.com>
Date: Fri, 28 Nov 2025 18:31:33 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E5=90=88=E6=95=B0=E6=8D=AE=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E3=80=81=E6=9C=80=E6=96=B0=E6=95=B0=E6=8D=AE=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jeecg/system/applet/controller/WxAppletController.java  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/controller/WxAppletController.java b/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/controller/WxAppletController.java
index 51091c5..01b2fdd 100644
--- a/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/controller/WxAppletController.java
+++ b/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/controller/WxAppletController.java
@@ -667,7 +667,7 @@ public class WxAppletController {
                         return R.ok(jsonArray);
                     }
                     //获取最新数据
-
+                    log.warn(pollutionEnum.getCode()+"================="+waterList);
                     if (PollutionConstants.AIR_SURV.equals(pollutionEnum.getType()) && airList.size() > 0) {//大气
 //                        List<SurvTransdataAirVo>  dataList= hisdataAirService.getResentData(airList,dataCounts);
 //                        jsonArray = JSONArray.parseArray(JSONObject.toJSONString(dataList));
@@ -680,13 +680,13 @@ public class WxAppletController {
                         Page<SurvTransdataSoilVo> page = new Page<SurvTransdataSoilVo>(pageNo, pageSize);
                         IPage<SurvTransdataSoilVo> pages = hisdataSoilService.getPageResentData(page, soilList);
                         return R.ok(pages);
-                    } else if (StationConstants.ORIENT.equals(survStationInfo.getStationType()) && pollutionEnum.getType().contains("water") && orientList.size() > 0) {//面源
+                    } else if (StationConstants.ORIENT.equals(survStationInfo.getStationType()) && pollutionEnum.getType().startsWith("water") && !orientList.isEmpty()) {//面源
 //                        List<SurvTransdataOrientwaterVo>  dataList= hisdataOrientwaterService.getResentData(orientList,dataCounts);
 //                        jsonArray = JSONArray.parseArray(JSONObject.toJSONString(dataList));
                         Page<SurvTransdataOrientwaterVo> page = new Page<SurvTransdataOrientwaterVo>(pageNo, pageSize);
                         IPage<SurvTransdataOrientwaterVo> pages = hisdataOrientwaterService.getPageResentData(page, orientList);
                         return R.ok(pages);
-                    } else if (StationConstants.LIVE_STOCK.equals(survStationInfo.getStationType()) && pollutionEnum.getType().contains("water") && liveList.size() > 0) {//畜禽
+                    } else if (StationConstants.LIVE_STOCK.equals(survStationInfo.getStationType()) && pollutionEnum.getType().startsWith("water") && !liveList.isEmpty()) {//畜禽
 //                        List<SurvTransdataLivestockwaterVo>  dataList= hisdataLivestockwaterService.getResentData(liveList,dataCounts);
 //                        jsonArray = JSONArray.parseArray(JSONObject.toJSONString(dataList));
                         Page<SurvTransdataLivestockwaterVo> page = new Page<SurvTransdataLivestockwaterVo>(pageNo, pageSize);