diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/IotCommonServiceImpl.java b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/IotCommonServiceImpl.java
index b00b1fa..4d75a9e 100644
--- a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/IotCommonServiceImpl.java
+++ b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/IotCommonServiceImpl.java
@@ -68,7 +68,7 @@ public class IotCommonServiceImpl {
         List<SurvDeviceDeploy> deploys = new ArrayList<>();
         if(voSurvIntegrateParam.getDeployIds() !=null && !voSurvIntegrateParam.getDeployIds().isEmpty()){
             deploys = fDeviceDeployService.listByIds(voSurvIntegrateParam.getDeployIds());
-        }else if(voSurvIntegrateParam.getStationCode()!=null && StringUtils.isNotBlank(voSurvIntegrateParam.getStationCode())){
+        }else{
             deploys = fDeviceDeployService.getAllDevice(voSurvIntegrateParam.getStationCode(),deployTypes);
         }
 
@@ -98,7 +98,7 @@ public class IotCommonServiceImpl {
         List<SurvDeviceDeploy> deploys = new ArrayList<>();
         if(voSurvIntegrateParam.getDeployIds() !=null && !voSurvIntegrateParam.getDeployIds().isEmpty()){
             deploys = fDeviceDeployService.listByIds(voSurvIntegrateParam.getDeployIds());
-        }else if(voSurvIntegrateParam.getStationCode()!=null && StringUtils.isNotBlank(voSurvIntegrateParam.getStationCode())){
+        }else {
             deploys = fDeviceDeployService.getAllDevice(voSurvIntegrateParam.getStationCode(),deployTypes);
         }
         VOIntegrateStatistic voIntegrateStatistic = new VOIntegrateStatistic();
@@ -563,7 +563,7 @@ public class IotCommonServiceImpl {
         if(!dataMap.isEmpty()){
             for (String s : dataMap.keySet()) {
                 if (s.startsWith("data")) {
-                    PollutionEnum pollutionEnum = PollutionEnum.catchMessage(s);
+                    PollutionEnum pollutionEnum = PollutionEnum.catchPollution(s);
                     String iconFinalName = pollutionEnum.getIconName();
                     String itemFinalName = pollutionEnum.getDescription();
                     String bsIcon = pollutionEnum.getBsIcon();
@@ -1117,7 +1117,7 @@ public class IotCommonServiceImpl {
         if(!dataMap.isEmpty()){
             for (String s : dataMap.keySet()) {
                 if (s.startsWith("data")) {
-                    PollutionEnum pollutionEnum = PollutionEnum.catchMessage(s);
+                    PollutionEnum pollutionEnum = PollutionEnum.catchPollution(s);
                     String iconFinalName = pollutionEnum.getIconName();
                     String itemFinalName = pollutionEnum.getDescription();
                     String bsIcon = pollutionEnum.getBsIcon();
diff --git a/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/controller/SurvDeviceDeployController.java b/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/controller/SurvDeviceDeployController.java
index 91d5e17..f3e992d 100644
--- a/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/controller/SurvDeviceDeployController.java
+++ b/zh-module-applet/zh-applet-api/src/main/java/org/jeecg/system/applet/controller/SurvDeviceDeployController.java
@@ -112,7 +112,6 @@ public class SurvDeviceDeployController  {
      @PostMapping(value = "/waterIntegrateStatistic")
      public R<VOIntegrateStatistic> waterIntegrateStatistic(@RequestBody VOWaterSurvIntegrateParam waterSurvIntegrateParam) {
          Result<VOIntegrateStatistic> job = zhAdminFeignClient.waterIntegrateStatistic(waterSurvIntegrateParam);
-         VOIntegrateStatistic voIntegrateStatistic = job.getResult();
-         return R.ok(voIntegrateStatistic);
+         return R.ok(job.getResult());
      }
 }