diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java
index 7ff0de0..5e38071 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java
@@ -32,7 +32,7 @@
     /**
      * 第三方燃气列表
      */
-    @RequestMapping("/gasdector/listPage")
+    @RequestMapping("/gasdector/listpage")
     public Object getGasDectorListPage(String keyWords, String endTime, String beginTime, String deptid) {
         Page<GasDectorDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();

diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java
index 7ff0de0..5e38071 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/ThirdPartyController.java
@@ -32,7 +32,7 @@
     /**
      * 第三方燃气列表
      */
-    @RequestMapping("/gasdector/listPage")
+    @RequestMapping("/gasdector/listpage")
     public Object getGasDectorListPage(String keyWords, String endTime, String beginTime, String deptid) {
         Page<GasDectorDataDto> page = PageFactory.defaultPage();
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml
index ac960ad..416c4bf 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/dao/mapping/ThirdPartyDataMapper.xml
@@ -55,30 +55,29 @@
         INNER JOIN bus_device_well bdw ON bd.ID=bdw.DEVICE_ID
         INNER JOIN bus_well_info bwi ON bdw.WELL_ID=bwi.ID
         WHERE bd.DEVCODE=dgd.DEVCODE
-        <where>
-            <if test="deptid != null and deptid !=''">
-                and bwi.DEPTID = #{deptid}
-            </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and dgd.LOGTIME  <![CDATA[ >= ]]>
-                <include refid="char_toDate">
-                    <property name="paramStr" value="#{beginTime}"/>
-                </include>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and dgd.LOGTIME <![CDATA[ <= ]]>
-                <include refid="char_toDate">
-                    <property name="paramStr" value="#{endTime}"/>
-                </include>
-            </if>
-            <if test="keywords != null and keywords !=''">
-                and (bd.DEVCODE like
-                <include refid="keywords_sql"/>
-                OR bwi.wellCode LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
+
+        <if test="deptid != null and deptid !=''">
+            and bwi.DEPTID = #{deptid}
+        </if>
+        <if test="beginTime != null and beginTime != '' ">
+            and dgd.LOGTIME  <![CDATA[ >= ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{beginTime}"/>
+            </include>
+        </if>
+        <if test="endTime != null and endTime != ''">
+            and dgd.LOGTIME <![CDATA[ <= ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{endTime}"/>
+            </include>
+        </if>
+        <if test="keywords != null and keywords !=''">
+            and (bd.DEVCODE like
+            <include refid="keywords_sql"/>
+            OR bwi.wellCode LIKE
+            <include refid="keywords_sql"/>
+            )
+        </if>
         ORDER BY dgd.LOGTIME DESC
     </select>
 
@@ -98,30 +97,28 @@
         INNER JOIN bus_device_well bdw ON bd.ID=bdw.DEVICE_ID
         INNER JOIN bus_well_info bwi ON bdw.WELL_ID=bwi.ID
         WHERE bd.DEVCODE=dp.DEVCODE
-        <where>
-            <if test="deptid != null and deptid !=''">
-                and bwi.DEPTID = #{deptid}
-            </if>
-            <if test="beginTime != null and beginTime != '' ">
-                and dp.LOGTIME  <![CDATA[ >= ]]>
-                <include refid="char_toDate">
-                    <property name="paramStr" value="#{beginTime}"/>
-                </include>
-            </if>
-            <if test="endTime != null and endTime != ''">
-                and dp.LOGTIME <![CDATA[ <= ]]>
-                <include refid="char_toDate">
-                    <property name="paramStr" value="#{endTime}"/>
-                </include>
-            </if>
-            <if test="keywords != null and keywords !=''">
-                and (bd.DEVCODE like
-                <include refid="keywords_sql"/>
-                OR bwi.wellCode LIKE
-                <include refid="keywords_sql"/>
-                )
-            </if>
-        </where>
+        <if test="deptid != null and deptid !=''">
+            and bwi.DEPTID = #{deptid}
+        </if>
+        <if test="beginTime != null and beginTime != '' ">
+            and dp.LOGTIME  <![CDATA[ >= ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{beginTime}"/>
+            </include>
+        </if>
+        <if test="endTime != null and endTime != ''">
+            and dp.LOGTIME <![CDATA[ <= ]]>
+            <include refid="char_toDate">
+                <property name="paramStr" value="#{endTime}"/>
+            </include>
+        </if>
+        <if test="keywords != null and keywords !=''">
+            and (bd.DEVCODE like
+            <include refid="keywords_sql"/>
+            OR bwi.wellCode LIKE
+            <include refid="keywords_sql"/>
+            )
+        </if>
         ORDER BY dp.LOGTIME DESC
     </select>