diff --git a/src/main/java/com/whdc/controller/QXWarnController.java b/src/main/java/com/whdc/controller/QXWarnController.java
index a223330..3eb6302 100644
--- a/src/main/java/com/whdc/controller/QXWarnController.java
+++ b/src/main/java/com/whdc/controller/QXWarnController.java
@@ -533,10 +533,16 @@ public class QXWarnController {
 
         List<QXWarning> list = service.list(dto);
 
-        ExcelCommon.exportExcel(list,
+        if (CollectionUtils.isNotEmpty(list)){
+            ExcelCommon.exportExcel(list,
                 null, "历史气象预警", QXWarning.class, "历史气象预警.xlsx",
                 response);
 
+        }else{
+            throw new MyException("没有查询到数据");
+        }
+        
+
     }
 
     /**
diff --git a/src/main/resources/mapper/QXWarningMapper.xml b/src/main/resources/mapper/QXWarningMapper.xml
index a2420da..e897245 100644
--- a/src/main/resources/mapper/QXWarningMapper.xml
+++ b/src/main/resources/mapper/QXWarningMapper.xml
@@ -43,9 +43,9 @@
 
         ORDER BY Q.WARNID DESC
     </select>
-    <select id="list" resultType="com.whdc.model.vo.QXWarningVO">
+    <select id="list" resultType="com.whdc.model.entity.QXWarning">
         SELECT
-            Q.*,IF( WF.ID IS NOT NULL,1,0) STATUS
+            Q.*
         FROM
             FXKH_TXL.QXWARNING Q
                 LEFT JOIN FXKH_TXL.WARNMSG_FEEDBACK WF ON WF.WARNID = Q.WARNID