diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
index 63decc1..c73d192 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/DataAnalysisMapper.xml
@@ -351,41 +351,39 @@
         </include>
         AS "uptime",
         status AS status,
-        bd.device_Type  as "deviceType",
+        bd.device_Type as "deviceType",
         cell,
         descn,
         deptid,
         bwi.well_code as "wellCode",
         type_name as "deviceTypeName"
-        FROM data_well_liquid  dwl
-        JOIN bus_device  bd  ON bd.DEVCODE=dwl.DEVCODE
+        FROM data_well_liquid dwl
+        JOIN bus_device bd ON bd.DEVCODE=dwl.DEVCODE
         JOIN bus_well_info bwi ON dwl.WELL_CODE = bwi.WELL_CODE
         JOIN base_device_type bdt ON bd.DEVICE_TYPE = bdt.ID
-        where bd.valid='1' AND  bwi.valid='1'
-        <where>
-            <if test="deptid != null and deptid != -1 ">
-                and deptid = #{deptid}
-            </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and dwl.UPTIME <![CDATA[ >= ]]>
-                <include refid="char_toDate">
-                    <property name="paramStr" value="#{beginTime}"/>
-                </include>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and dwl.UPTIME <![CDATA[ <= ]]>
-                <include refid="char_toDate">
-                    <property name="paramStr" value="#{endTime}"/>
-                </include>
-            </if>
-            <if test="keywords != null and keywords !=''">
-                and (dwl.devcode like
-                <include refid="keywords_sql"/>
-                OR   dwl.well_code LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
+        where bd.valid='1' AND bwi.valid='1'
+        <if test="deptid != null and deptid != -1 ">
+            and deptid = #{deptid}
+        </if>
+        <if test="beginTime != null and beginTime != '' ">
+            and dwl.UPTIME <![CDATA[ >= ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{beginTime}"/>
+            </include>
+        </if>
+        <if test="endTime != null and endTime != ''">
+            and dwl.UPTIME <![CDATA[ <= ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{endTime}"/>
+            </include>
+        </if>
+        <if test="keywords != null and keywords !=''">
+            and (dwl.devcode like
+            <include refid="keywords_sql"/>
+            OR dwl.well_code LIKE
+            <include refid="keywords_sql"/>
+            )
+        </if>
         ORDER BY dwl.uptime DESC
     </select>