diff --git a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/impl/AlarmServiceImpl.java b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/impl/AlarmServiceImpl.java
index b710add..e9dd76f 100644
--- a/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/impl/AlarmServiceImpl.java
+++ b/hzims-service/hzims-alarm/src/main/java/com/hnac/hzims/alarm/show/service/impl/AlarmServiceImpl.java
@@ -62,6 +62,7 @@ public class AlarmServiceImpl extends BaseServiceImpl<AlarmMapper, AlarmEntity>
 
         // 参数过滤 ：站点、告警来源、告警子类
         QueryWrapper wrapper = new QueryWrapper<>();
+        wrapper.orderByDesc("CREATE_TIME");
         wrapper.eq("IS_RIGHT_TABULATION",0);
         wrapper.in("STATION_ID",stations.stream().map(StationEntity::getCode).collect(Collectors.toList()));
         if(!StringUtil.isEmpty(alarm.getStationId())){
diff --git a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/impl/OperMaintenanceTaskServiceImpl.java b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/impl/OperMaintenanceTaskServiceImpl.java
index 6d7b1fc..8881fc1 100644
--- a/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/impl/OperMaintenanceTaskServiceImpl.java
+++ b/hzims-service/operational/src/main/java/com/hnac/hzims/operational/maintenance/service/impl/OperMaintenanceTaskServiceImpl.java
@@ -153,6 +153,9 @@ public class OperMaintenanceTaskServiceImpl extends BaseServiceImpl<OperMaintena
             if (StringUtil.isNoneBlank(req.getFlowTaskName())) {
                 eq(OperMaintenanceTaskEntity::getFlowTaskName, req.getFlowTaskName());
             }
+            if(ObjectUtil.isNotEmpty(req.getPlanId())){
+                eq(OperMaintenanceTaskEntity::getPlanId,req.getPlanId());
+            }
         }};
         return queryWrapper;
     }