diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml
index a205e08..c3e0f73 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml
@@ -21,10 +21,10 @@
         <if test="alarmType != null and alarmType !=-1">
             AND ALARM_TYPE= #{alarmType}
         </if>
-        <if test="deviceType != null and deviceType !=''">
+        <if test="deviceType != null and deviceType !=-1">
             AND DEVICE_TYPE = #{deviceType}
         </if>
-        <if test="alarmContent != null and alarmContent !=-1 ">
+        <if test="alarmContent != null and alarmContent !=''">
             AND ALARM_CONTENT like
             <include refid="keywords_sql"/>
         </if>

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml
index a205e08..c3e0f73 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmContentTypeMapper.xml
@@ -21,10 +21,10 @@
         <if test="alarmType != null and alarmType !=-1">
             AND ALARM_TYPE= #{alarmType}
         </if>
-        <if test="deviceType != null and deviceType !=''">
+        <if test="deviceType != null and deviceType !=-1">
             AND DEVICE_TYPE = #{deviceType}
         </if>
-        <if test="alarmContent != null and alarmContent !=-1 ">
+        <if test="alarmContent != null and alarmContent !=''">
             AND ALARM_CONTENT like
             <include refid="keywords_sql"/>
         </if>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
index 0c2387e..6feea91 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
@@ -72,7 +72,7 @@
         <if test="alarmType!=null and alarmType!=-1">
             AND alarm_type = #{alarmType}]
         </if>
-        <if test="deviceType!=null and deviceType!=-1'">
+        <if test="deviceType!=null and deviceType!=-1">
             AND device_type= #{deviceType}
         </if>
         order by id;