From 7e8f61130822dd21530383aa85a34a8873c502a6 Mon Sep 17 00:00:00 2001
From: zy <82248909@qq.com>
Date: Fri, 28 Nov 2025 18:13: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 +++---
 .../jeecg/system/applet/mapper/xml/SurvHisdataAirMapper.xml | 2 +-
 .../system/applet/mapper/xml/SurvHisdataSoilMapper.xml      | 2 +-
 3 files changed, 5 insertions(+), 5 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 f8e94a3..51091c5 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
@@ -641,10 +641,10 @@ public class WxAppletController {
                     List<String> waterList =new ArrayList<>();
                     for (SurvDeviceDeploy survDeviceDeploy : survStationInfo.getDeviceList()) {
                         if (PollutionConstants.SOIL_SURV.equals(survDeviceDeploy.getDeployType())) {//土壤设备
-                            soilList.add(survDeviceDeploy.getDeployCode());
+                            soilList.add(survDeviceDeploy.getId());
                         } else if (PollutionConstants.AIR_SURV.equals(survDeviceDeploy.getDeployType())) {//气象设备
-                            airList.add(survDeviceDeploy.getDeployCode());
-                        } else if (PollutionConstants.WATER_QULITY.equals(survDeviceDeploy.getDeployType())) {//气象设备
+                            airList.add(survDeviceDeploy.getId());
+                        } else if (PollutionConstants.WATER_QULITY.equals(survDeviceDeploy.getDeployType())) {//水质设备
                             waterList.add(survDeviceDeploy.getId());
                         }else if (PollutionConstants.WATER_ORIENT.equals(survDeviceDeploy.getDeployType())) {//面源
                             orientList.add(survDeviceDeploy.getDeployCode());
diff --git a/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/mapper/xml/SurvHisdataAirMapper.xml b/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/mapper/xml/SurvHisdataAirMapper.xml
index 7d40297..66392fd 100644
--- a/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/mapper/xml/SurvHisdataAirMapper.xml
+++ b/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/mapper/xml/SurvHisdataAirMapper.xml
@@ -64,7 +64,7 @@
     </select>
 
     <select id="getPageResentData" resultMap="baseResultVoMap">
-        select * from surv_hisdata_air where DEPLOY_CODE IN
+        select * from surv_hisdata_air where DEPLOY_ID IN
         <foreach collection="airList" index="index" item="id" open="(" separator="," close=")">
             #{id}
         </foreach>
diff --git a/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/mapper/xml/SurvHisdataSoilMapper.xml b/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/mapper/xml/SurvHisdataSoilMapper.xml
index 02e4488..716fce4 100644
--- a/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/mapper/xml/SurvHisdataSoilMapper.xml
+++ b/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/mapper/xml/SurvHisdataSoilMapper.xml
@@ -119,7 +119,7 @@
     </select>
 
     <select id="getPageResentData" resultMap="baseResultVoMap">
-        select <include refid="baseSql"/> from surv_hisdata_soil where DEPLOY_CODE IN
+        select <include refid="baseSql"/> from surv_hisdata_soil where DEPLOY_ID IN
         <foreach collection="soilList" index="index" item="id" open="(" separator="," close=")">
             #{id}
         </foreach>