diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DataOpsExportController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DataOpsExportController.java
index 147524d..d775667 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DataOpsExportController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DataOpsExportController.java
@@ -197,27 +197,21 @@
         private List<DataFieldDefine> dataFieldDefines;
         private List<Map<String, Object>> data;
         private String sheetName;
-
         public List<DataFieldDefine> getDataFieldDefines() {
             return dataFieldDefines;
         }
-
         public void setDataFieldDefines(List<DataFieldDefine> dataFieldDefines) {
             this.dataFieldDefines = dataFieldDefines;
         }
-
         public List<Map<String, Object>> getData() {
             return data;
         }
-
         public void setData(List<Map<String, Object>> data) {
             this.data = data;
         }
-
         public String getSheetName() {
             return sheetName;
         }
-
         public void setSheetName(String sheetName) {
             this.sheetName = sheetName;
         }

diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DataOpsExportController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DataOpsExportController.java
index 147524d..d775667 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DataOpsExportController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DataOpsExportController.java
@@ -197,27 +197,21 @@
         private List<DataFieldDefine> dataFieldDefines;
         private List<Map<String, Object>> data;
         private String sheetName;
-
         public List<DataFieldDefine> getDataFieldDefines() {
             return dataFieldDefines;
         }
-
         public void setDataFieldDefines(List<DataFieldDefine> dataFieldDefines) {
             this.dataFieldDefines = dataFieldDefines;
         }
-
         public List<Map<String, Object>> getData() {
             return data;
         }
-
         public void setData(List<Map<String, Object>> data) {
             this.data = data;
         }
-
         public String getSheetName() {
             return sheetName;
         }
-
         public void setSheetName(String sheetName) {
             this.sheetName = sheetName;
         }
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
index edd2703..ceabddc 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceDataListMapper.xml
@@ -742,10 +742,33 @@
         </where>
     </select>
     <select id="selectDeviceList" resultType="java.util.Map">
-        SELECT aa.*, b.device_type FROM
-        (SELECT ROW_NUMBER() over(PARTITION BY devcode ORDER BY logtime DESC ) AS num,${tableColumns}
-        FROM ${tableName}) aa left join bus_device b on aa.devcode=b.devcode
-        WHERE aa.num = 1 ORDER BY aa.${orderColumn} DESC
+        SELECT
+            b.device_type,
+            b.devcode,
+            d.well_code,
+            A.*
+        FROM
+            bus_device b
+                INNER JOIN bus_device_well C ON b."id" = C.device_id
+                INNER JOIN bus_well_info d ON d.ID = C.well_id
+                LEFT JOIN (
+                SELECT
+                    *
+                FROM
+                    (
+                        SELECT ROW_NUMBER
+                                   ( ) OVER ( PARTITION BY devcode ORDER BY logtime DESC ) AS num,
+                                ${tableColumns}
+                        FROM
+                            ${tableName}
+                    ) aa
+                WHERE
+                    aa.num = 1
+            ) A ON A.devcode = b.devcode
+        WHERE
+            C."valid" = '1'
+        ORDER BY
+            A.logtime
     </select>
     <select id="selectAlarmRecords" resultType="java.util.Map">
         SELECT
@@ -760,7 +783,7 @@
                 INNER JOIN bus_device_well C ON b."id" = C.device_id
                 INNER JOIN bus_well_info d ON d.ID = C.well_id
                 LEFT JOIN ( SELECT device_id, COUNT ( 1 ) AS alarm_num FROM alarm_records A
-                <where>
+        <where>
                     <if test="startTime != null and startTime != '' ">
                         and alarm_time <![CDATA[ >= ]]>
                         <include refid="char_toDate">
@@ -773,9 +796,9 @@
                             <property name="paramStr" value="#{endTime}"/>
                         </include>
                     </if>
-                </where>
+        </where>
                 GROUP BY device_id ) e ON b.ID = e.device_id
-        <where>
+        <where> C."valid" = '1'
             <if test="deviceType != null and deviceType !=''">
                 AND b.device_type = #{deviceType}
             </if>
@@ -796,8 +819,8 @@
                 INNER JOIN bus_device_well C ON b."id" = C.device_id
                 INNER JOIN bus_well_info d ON d.ID = C.well_id
                 LEFT JOIN (SELECT devcode, COUNT ( 1 ) AS data_num FROM ${tableName}
-        <where>
-            <if test="startTime != null and startTime != '' ">
+            <where>
+        <if test="startTime != null and startTime != '' ">
                 and logtime <![CDATA[ >= ]]>
                 <include refid="char_toDate">
                     <property name="paramStr" value="#{startTime}"/>
@@ -808,9 +831,10 @@
                 <include refid="char_toDate">
                     <property name="paramStr" value="#{endTime}"/>
                 </include>
-            </if>
-        </where>
+            </if></where>
+
                 GROUP BY devcode ) e ON b.devcode = e.devcode
+        where C."valid" = '1'
         order by devcode
     </select>
 </mapper>