diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/SurvAlertRecordController.java b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/SurvAlertRecordController.java
index 4e67ec1..eef4424 100644
--- a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/SurvAlertRecordController.java
+++ b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/SurvAlertRecordController.java
@@ -53,10 +53,10 @@ public class SurvAlertRecordController extends JeecgController<SurvAlertRecord,
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 								   HttpServletRequest req) {
-//		QueryWrapper<SurvAlertRecord> queryWrapper = QueryGenerator.initQueryWrapper(survAlertRecord, req.getParameterMap());
+		QueryWrapper<SurvAlertRecord> queryWrapper = QueryGenerator.initQueryWrapper(survAlertRecord, req.getParameterMap());
 		Page<SurvAlertRecord> page = new Page<>(pageNo, pageSize);
-		IPage<SurvAlertRecord> pageList = survAlertRecordService.pages(page, survAlertRecord);
-//		IPage<SurvAlertRecord> pageList = survAlertRecordService.page(page, queryWrapper);
+//		IPage<SurvAlertRecord> pageList = survAlertRecordService.pages(page, survAlertRecord);
+		IPage<SurvAlertRecord> pageList = survAlertRecordService.page(page, queryWrapper);
 		return Result.OK(pageList);
 	}
 	
diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/SurvHisdataLivestockwaterController.java b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/SurvHisdataLivestockwaterController.java
index 00150b6..69a3222 100644
--- a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/SurvHisdataLivestockwaterController.java
+++ b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/SurvHisdataLivestockwaterController.java
@@ -1,5 +1,6 @@
 package org.jeecg.modules.appmana.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.Api;
@@ -11,7 +12,9 @@ import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.constant.PollutionConstants;
 import org.jeecg.common.entity.SurvHisdataLivestockwater;
+import org.jeecg.common.entity.SurvHisdataOrientwater;
 import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.modules.appmana.service.ISurvDeviceDeployService;
 import org.jeecg.modules.appmana.service.ISurvHisdataLivestockwaterService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -56,7 +59,7 @@ public class SurvHisdataLivestockwaterController extends JeecgController<SurvHis
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 								   HttpServletRequest req) {
-//		QueryWrapper<SurvHisdataLivestockwater> queryWrapper = QueryGenerator.initQueryWrapper(survHisdataLivestockwater, req.getParameterMap());
+		QueryWrapper<SurvHisdataLivestockwater> queryWrapper = QueryGenerator.initQueryWrapper(survHisdataLivestockwater, req.getParameterMap());
 		Page<SurvHisdataLivestockwater> page = new Page<SurvHisdataLivestockwater>(pageNo, pageSize);
 		//查询站点设备
 		List<String> deviceList = new ArrayList<>();
@@ -67,8 +70,9 @@ public class SurvHisdataLivestockwaterController extends JeecgController<SurvHis
 				return Result.OK(emptyPage);
 			}
 		}
-
-		IPage<SurvHisdataLivestockwater> pageList = survHisdataLivestockwaterService.pages(page, survHisdataLivestockwater,deviceList);
+		queryWrapper.lambda().in(deviceList!=null && !deviceList.isEmpty(), SurvHisdataLivestockwater::getDeployCode, deviceList);
+//		IPage<SurvHisdataLivestockwater> pageList = survHisdataLivestockwaterService.pages(page, survHisdataLivestockwater,deviceList);
+		IPage<SurvHisdataLivestockwater> pageList = survHisdataLivestockwaterService.page(page, queryWrapper);
 		return Result.OK(pageList);
 	}
 	
diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/SurvHisdataOrientwaterController.java b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/SurvHisdataOrientwaterController.java
index bae8336..07d4e0b 100644
--- a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/SurvHisdataOrientwaterController.java
+++ b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/SurvHisdataOrientwaterController.java
@@ -1,5 +1,6 @@
 package org.jeecg.modules.appmana.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.Api;
@@ -12,6 +13,7 @@ import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.constant.PollutionConstants;
 import org.jeecg.common.entity.SurvHisdataOrientwater;
 import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.modules.appmana.service.ISurvDeviceDeployService;
 import org.jeecg.modules.appmana.service.ISurvHisdataOrientwaterService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -56,8 +58,8 @@ public class SurvHisdataOrientwaterController extends JeecgController<SurvHisdat
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 								   HttpServletRequest req) {
-//		QueryWrapper<SurvHisdataOrientwater> queryWrapper = QueryGenerator.initQueryWrapper(survHisdataOrientwater, req.getParameterMap());
-		Page<SurvHisdataOrientwater> page = new Page<SurvHisdataOrientwater>(pageNo, pageSize);
+		QueryWrapper<SurvHisdataOrientwater> queryWrapper = QueryGenerator.initQueryWrapper(survHisdataOrientwater, req.getParameterMap());
+		Page<SurvHisdataOrientwater> page = new Page<>(pageNo, pageSize);
 
 		//查询站点设备
 		List<String> deviceList = new ArrayList<>();
@@ -69,7 +71,9 @@ public class SurvHisdataOrientwaterController extends JeecgController<SurvHisdat
 				return Result.OK(emptyPage);
 			}
 		}
-		IPage<SurvHisdataOrientwater> pageList = survHisdataOrientwaterService.pages(page, survHisdataOrientwater,deviceList);
+		queryWrapper.lambda().in(deviceList!=null && !deviceList.isEmpty(), SurvHisdataOrientwater::getDeployCode, deviceList);
+//		IPage<SurvHisdataOrientwater> pageList = survHisdataOrientwaterService.pages(page, survHisdataOrientwater,deviceList);
+		IPage<SurvHisdataOrientwater> pageList = survHisdataOrientwaterService.page(page, queryWrapper);
 		return Result.OK(pageList);
 	}
 	
diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/SurvHisdataSoilController.java b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/SurvHisdataSoilController.java
index 578732f..2fc84db 100644
--- a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/SurvHisdataSoilController.java
+++ b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/SurvHisdataSoilController.java
@@ -1,5 +1,6 @@
 package org.jeecg.modules.appmana.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import io.swagger.annotations.Api;
@@ -10,6 +11,7 @@ import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.entity.SurvHisdataSoil;
 import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.modules.appmana.service.ISurvDeviceDeployService;
 import org.jeecg.modules.appmana.service.ISurvHisdataSoilService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -52,8 +54,9 @@ public class SurvHisdataSoilController extends JeecgController<SurvHisdataSoil,
 	@GetMapping(value = "/list")
 	public Result<IPage<SurvHisdataSoil>> queryPageList(SurvHisdataSoil survHisdataSoil,
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize) {
-//		QueryWrapper<SurvHisdataSoil> queryWrapper = QueryGenerator.initQueryWrapper(survHisdataSoil, req.getParameterMap());
+								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+														HttpServletRequest req) {
+		QueryWrapper<SurvHisdataSoil> queryWrapper = QueryGenerator.initQueryWrapper(survHisdataSoil, req.getParameterMap());
 		Page<SurvHisdataSoil> page = new Page<SurvHisdataSoil>(pageNo, pageSize);
         //查询站点设备
 		List<String> deviceList = new ArrayList<>();
@@ -64,7 +67,8 @@ public class SurvHisdataSoilController extends JeecgController<SurvHisdataSoil,
 //				return Result.OK(emptyPage);
 //			}
 //		}
-		IPage<SurvHisdataSoil> pageList = survHisdataSoilService.pages(page, survHisdataSoil,deviceList);
+//		IPage<SurvHisdataSoil> pageList = survHisdataSoilService.pages(page, survHisdataSoil,deviceList);
+		IPage<SurvHisdataSoil> pageList = survHisdataSoilService.page(page, queryWrapper);
 		return Result.OK(pageList);
 	}
 	
diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/SurvHisdataSoilServiceImpl.java b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/SurvHisdataSoilServiceImpl.java
index e3dde27..3d6285d 100644
--- a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/SurvHisdataSoilServiceImpl.java
+++ b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/service/impl/SurvHisdataSoilServiceImpl.java
@@ -45,7 +45,7 @@ public class SurvHisdataSoilServiceImpl extends ServiceImpl<SurvHisdataSoilMappe
             deployList = Arrays.asList(ss);
         }
         survHisdataSoil.setDeployList(deployList);
-        IPage<SurvHisdataSoil> p =  baseMapper.pages(page,survHisdataSoil,deviceList);
+        IPage<SurvHisdataSoil> p = baseMapper.pages(page,survHisdataSoil,deviceList);
         fill(p.getRecords());
         return p;
     }