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 9870022..4e67ec1 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
@@ -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.SurvAlertRecord;
 import org.jeecg.common.system.base.controller.JeecgController;
+import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.util.JwtUtil;
 import org.jeecg.modules.appmana.service.ISurvAlertRecordService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -52,8 +54,9 @@ public class SurvAlertRecordController extends JeecgController<SurvAlertRecord,
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 								   HttpServletRequest req) {
 //		QueryWrapper<SurvAlertRecord> queryWrapper = QueryGenerator.initQueryWrapper(survAlertRecord, req.getParameterMap());
-		Page<SurvAlertRecord> page = new Page<SurvAlertRecord>(pageNo, pageSize);
+		Page<SurvAlertRecord> page = new Page<>(pageNo, pageSize);
 		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/SurvHisdataOrientwaterController.java b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/controller/SurvHisdataOrientwaterController.java
index 647e17d..bae8336 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
@@ -62,7 +62,8 @@ public class SurvHisdataOrientwaterController extends JeecgController<SurvHisdat
 		//查询站点设备
 		List<String> deviceList = new ArrayList<>();
 		if(StringUtils.isNotBlank(survHisdataOrientwater.getStationCode())) {
-			deviceList = deployService.getDeviceListByStation(survHisdataOrientwater.getStationCode(), PollutionConstants.WATER_ORIENT);
+			deviceList = deployService.getDeviceListByStation(survHisdataOrientwater.getStationCode(),
+					PollutionConstants.WATER_ORIENT);
 			if (deviceList.size() == 0) {//如果没有此类设备，则返回空
 				IPage emptyPage = new Page(1,1);
 				return Result.OK(emptyPage);
diff --git a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvAlertRecordMapper.xml b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvAlertRecordMapper.xml
index 92a93f9..05366d5 100644
--- a/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvAlertRecordMapper.xml
+++ b/zh-module-applet/zh-applet-admin/src/main/java/org/jeecg/modules/appmana/mapper/xml/SurvAlertRecordMapper.xml
@@ -48,6 +48,12 @@
         <if test="param2.deployCode!=null and param2.deployCode!=''">
             and DEPLOY_CODE = #{param2.deployCode}
         </if>
+        <if test="param2.stationCdoe!=null and param2.stationCdoe!=''">
+            and station_cdoe = #{param2.stationCdoe}
+        </if>
+        <if test="param2.readStatus!=null and param2.readStatus!=''">
+            and read_status = #{param2.readStatus}
+        </if>
         <if test="param2.alertTime!=null">
             and DATE_FORMAT(ALERT_TIME,'%Y-%m-%d %H') = DATE_FORMAT(#{param2.alertTime},'%Y-%m-%d %H')
         </if>