diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
index 902a7fc..5efaea8 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
@@ -25,7 +25,8 @@
     <select id="getAlarmsByWell" resultType="com.casic.missiles.modular.system.dto.AlarmNowView">
         SELECT
         <include refid="Alarm_Column_List"/>
-        FROM alarm_now_view w WHERE 1 = 1 AND wellId = #{id}
+        FROM alarm_now_view w
+        WHERE   wellId = #{id}
     </select>
 
 

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
index 902a7fc..5efaea8 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
@@ -25,7 +25,8 @@
     <select id="getAlarmsByWell" resultType="com.casic.missiles.modular.system.dto.AlarmNowView">
         SELECT
         <include refid="Alarm_Column_List"/>
-        FROM alarm_now_view w WHERE 1 = 1 AND wellId = #{id}
+        FROM alarm_now_view w
+        WHERE   wellId = #{id}
     </select>
 
 
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
index eac1293..abec443 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeviceMapper.xml
@@ -122,12 +122,12 @@
         <if test="deptid != null and deptid !=-1">
             and deptid = #{deptid}
         </if>
-        <if test="isOnline != null and isOnline !='' and  isOnline !='1'">
-            and (bds.ONLINE_STATE ='1' or  bds.ONLINE_STATE is null)
-        </if>
-        <if test="isOnline != null and isOnline !='' and  isOnline !='0'">
+        <if test="isOnline != null and isOnline !='' and  isOnline != 1 ">
             and bds.ONLINE_STATE ='0'
         </if>
+        <if test="isOnline != null and isOnline !='' and  isOnline != 0 ">
+            and (bds.ONLINE_STATE ='1' or  bds.ONLINE_STATE is null)
+        </if>
         <if test="beginTime != null and beginTime != '' ">
             and installDate &gt;
             <include refid="dateTime_toChar">
@@ -163,12 +163,12 @@
         <if test="deptid != null and deptid != -1">
             and deptid = #{deptid}
         </if>
-        <if test="isOnline != null and isOnline !='' and  isOnline !='1'">
-            and (bds.ONLINE_STATE ='1' or  bds.ONLINE_STATE is null)
-        </if>
-        <if test="isOnline != null and isOnline !='' and  isOnline !='0'">
+        <if test="isOnline != null and isOnline !='' and  isOnline != 1 ">
             and bds.ONLINE_STATE ='0'
         </if>
+        <if test="isOnline != null and isOnline !='' and  isOnline != 0 ">
+            and (bds.ONLINE_STATE ='1' or  bds.ONLINE_STATE is null)
+        </if>
         <if test="beginTime != null and beginTime != '' ">
             and installDate &gt;
             <include refid="dateTime_toChar">