diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/BigScreenController.java b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/BigScreenController.java
index 055b0be..793befa 100644
--- a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/BigScreenController.java
+++ b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/BigScreenController.java
@@ -416,7 +416,7 @@ public class BigScreenController {
                     if(StringUtils.isNotBlank(dataMode)){
                         dataTypes = dataMode;
                     }
-                    if(IotConstants.Data_Types_All.equals(dataMode) || IotConstants.Data_Types_Nsp.equals(dataMode)) {
+                    if(IotConstants.Data_Types_All.equals(dataTypes) || IotConstants.Data_Types_Nsp.equals(dataTypes)) {
 
                         if (orientList.size() > 0) {//面源
                             SurvTransdataOrientwaterVo transdataOrientwaterVo = transdataOrientwaterService.getNewestDataWithStation(orientList);
@@ -543,7 +543,7 @@ public class BigScreenController {
                         }
 
                     }
-                    if(IotConstants.Data_Types_All.equals(dataMode) || IotConstants.Data_Types_Water.equals(dataMode)) {
+                    if(IotConstants.Data_Types_All.equals(dataTypes) || IotConstants.Data_Types_Water.equals(dataTypes)) {
                         if (!waterList.isEmpty()) { //五常
                             List<CommonDataTrans> commonDataTrans = CommonUtils.transData(waterList.get(0), false, null, null, null, null).getTransData();
                             listFinal.addAll(commonDataTrans);
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 f7f28aa..8a81302 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
@@ -186,7 +186,7 @@ public class WxAppletController {
                     if(StringUtils.isNotBlank(dataMode)){
                         dataTypes = dataMode;
                     }
-                   if(IotConstants.Data_Types_All.equals(dataMode) || IotConstants.Data_Types_Nsp.equals(dataMode)) {
+                   if(IotConstants.Data_Types_All.equals(dataTypes) || IotConstants.Data_Types_Nsp.equals(dataTypes)) {
                        if (orientList.size() > 0) {//面源
                            SurvTransdataOrientwaterVo transdataOrientwaterVo = orientwaterService.getNewestDataWithStation(orientList);
                            if (transdataOrientwaterVo != null) {
@@ -307,7 +307,7 @@ public class WxAppletController {
                            }
                        }
                    }
-                    if(IotConstants.Data_Types_All.equals(dataMode) || IotConstants.Data_Types_Water.equals(dataMode)) {
+                    if(IotConstants.Data_Types_All.equals(dataTypes) || IotConstants.Data_Types_Water.equals(dataTypes)) {
                         if(!waterList.isEmpty()) {//五常
                             VOTransData voTransData = zhAdminFeignClient.deviceNewestData(waterList.get(0));
                             if(voTransData!=null){