From 8b036981852699d739ad93eb701f9ee2a2253d5f Mon Sep 17 00:00:00 2001
From: zy <82248909@qq.com>
Date: Thu, 20 Nov 2025 09:47:18 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=87=E6=BB=A4=E5=B7=B2=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E8=AE=BE=E5=A4=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../appmana/mapper/xml/SurvStationInfoMapper.xml     | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvStationInfoMapper.xml b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvStationInfoMapper.xml
index afc72ed..48f48ae 100644
--- a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvStationInfoMapper.xml
+++ b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvStationInfoMapper.xml
@@ -43,7 +43,7 @@
     </sql>
 
     <select id="getDeviceList" resultType="org.jeecg.common.entity.SurvDeviceDeploy">
-        select ID,DEPLOY_TYPE,DEPLOY_CODE,DEPLOY_PIC,DEVICE_URL,DEVICE_CODE,DEPLOY_DES,SORT_NO,DEVICE_IOT_URL,DEVICE_REVERSE_IOT_URL,MAP_ICON,DEVICE_LONGLAT,DEPLOY_SECONDARY_TYPE,#{ysToken} as ysToken from surv_device_deploy where STATION_CODE = #{STATION_CODE}
+        select ID,DEPLOY_TYPE,DEPLOY_CODE,DEPLOY_PIC,DEVICE_URL,DEVICE_CODE,DEPLOY_DES,SORT_NO,DEVICE_IOT_URL,DEVICE_REVERSE_IOT_URL,MAP_ICON,DEVICE_LONGLAT,DEPLOY_SECONDARY_TYPE,#{ysToken} as ysToken from surv_device_deploy where IS_DEL = 0 AND STATION_CODE = #{STATION_CODE}
         <if test="deviceType != null and deviceType != ''">
             AND DEPLOY_TYPE = #{deviceType}
         </if>
@@ -55,10 +55,12 @@
     </select>
 
     <select id="getAllStationAndDevice" resultMap="extMap">
-        select <include refid="baseSql" />,#{deviceType} as deviceType,#{token} as ysToken from surv_station_info where 1=1
-        <if test="stationCode != null and stationCode != ''">
-            AND STATION_CODE = #{stationCode}
-        </if>
+        select <include refid="baseSql" />,#{deviceType} as deviceType,#{token} as ysToken from surv_station_info
+        <where>
+            <if test="stationCode != null and stationCode != ''">
+                AND STATION_CODE = #{stationCode}
+            </if>
+        </where>
         order by SORT_NO
     </select>
 </mapper>
\ No newline at end of file