diff --git a/src/main/java/com/gunshi/project/xyt/controller/ReservoirWaterController.java b/src/main/java/com/gunshi/project/xyt/controller/ReservoirWaterController.java
index 01c63d0..9249d69 100644
--- a/src/main/java/com/gunshi/project/xyt/controller/ReservoirWaterController.java
+++ b/src/main/java/com/gunshi/project/xyt/controller/ReservoirWaterController.java
@@ -115,16 +115,16 @@ public class ReservoirWaterController {
         AttResMonitorVo attResMonitorVo = new AttResMonitorVo();
 
         LambdaQueryWrapper<StRsvrR> qw = new LambdaQueryWrapper<>();
-        qw.eq(StRsvrR::getStcd,"61610700").orderByDesc(StRsvrR::getTm).last(" limit 1");
+        qw.eq(StRsvrR::getStcd,dataQueryCommonSo.getStcd()).orderByDesc(StRsvrR::getTm).last(" limit 1");
         List<StRsvrR> list1 = stRsvrRService.list(qw);
         if(CollectionUtils.isNotEmpty(list1)){
             attResMonitorVo.setRz(new BigDecimal(list1.get(0).getRz()));
             attResMonitorVo.setTm(list1.get(0).getTm());
         }
         LambdaQueryWrapper<StPptnR> qw2= new LambdaQueryWrapper<>();
-        qw2.eq(StPptnR::getStcd,"61610700").gt(StPptnR::getDyp,"0").orderByDesc(StPptnR::getTm).last(" limit 1");
+        qw2.eq(StPptnR::getStcd,dataQueryCommonSo.getStcd()).gt(StPptnR::getDyp,"0").orderByDesc(StPptnR::getTm).last(" limit 1");
         List<StPptnR> list3 = stPptnRService.list(qw2);
-        if(Objects.nonNull(list3)){
+        if(CollectionUtils.isNotEmpty(list3)){
             attResMonitorVo.setTodayRainNum(new BigDecimal(list3.get(0).getDyp()));
             attResMonitorVo.setTodayRainNumTm(list3.get(0).getTm());
         }
diff --git a/src/main/java/com/gunshi/project/xyt/mapper/GateValveRealMapper.java b/src/main/java/com/gunshi/project/xyt/mapper/GateValveRealMapper.java
index c200a0c..f4ecd7a 100644
--- a/src/main/java/com/gunshi/project/xyt/mapper/GateValveRealMapper.java
+++ b/src/main/java/com/gunshi/project/xyt/mapper/GateValveRealMapper.java
@@ -26,7 +26,7 @@ public interface GateValveRealMapper extends BaseMapper<GateValveReal> {
             SELECT t.valve_code,t.valve_name,t.manual_operation,case when s.status = '100%' then '全开' when s.status = '0%' then '关' else s.status end as status,s.tm
             FROM public.att_gate_valve t
             LEFT JOIN public.gate_valve_real s ON t.valve_code = s.valve_code
-            order by s.tm desc nulls last 
+            order by t._order asc nulls last
             </script>
             """)
     List<GateStautsVo> gateStatusList();