diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
index 0bff8ec..66df59f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.util.EhcacheConstant;
@@ -21,7 +22,9 @@
     public ResponseData selectListPage(String alarmType, String deviceType, String alarmContent) {
         ResponseData responseData = new ResponseData();
         try {
-            List<Map<String, Object>> alarmContentTypeList = this.baseMapper.selectListPage(alarmType, deviceType, alarmContent);
+            List<Map<String, Object>> alarmContentTypeList = this.baseMapper.selectListPage(
+                    Long.valueOf(StrUtil.isEmpty(alarmType) ? "-1" : alarmType),
+                    Long.valueOf(StrUtil.isEmpty(deviceType) ? "-1" : deviceType), alarmContent);
             supplementData(alarmContentTypeList);
             responseData.setData(alarmContentTypeList);
             responseData.setMessage("success");
@@ -80,7 +83,7 @@
         alarmContentTypeList.forEach(
                 alarmType -> {
                     alarmType.put("alarmTypeName", EhcacheConstant.retBean().getAlarmTypeNameByCodeNum(alarmType.get("alarmType").toString()));
-                    alarmType.put("deviceTypeName",EhcacheConstant.retBean().getDeviceTypeNameById(alarmType.get("deviceType").toString()));
+                    alarmType.put("deviceTypeName", EhcacheConstant.retBean().getDeviceTypeNameById(alarmType.get("deviceType").toString()));
                 }
         );
     }

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
index 0bff8ec..66df59f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.util.EhcacheConstant;
@@ -21,7 +22,9 @@
     public ResponseData selectListPage(String alarmType, String deviceType, String alarmContent) {
         ResponseData responseData = new ResponseData();
         try {
-            List<Map<String, Object>> alarmContentTypeList = this.baseMapper.selectListPage(alarmType, deviceType, alarmContent);
+            List<Map<String, Object>> alarmContentTypeList = this.baseMapper.selectListPage(
+                    Long.valueOf(StrUtil.isEmpty(alarmType) ? "-1" : alarmType),
+                    Long.valueOf(StrUtil.isEmpty(deviceType) ? "-1" : deviceType), alarmContent);
             supplementData(alarmContentTypeList);
             responseData.setData(alarmContentTypeList);
             responseData.setMessage("success");
@@ -80,7 +83,7 @@
         alarmContentTypeList.forEach(
                 alarmType -> {
                     alarmType.put("alarmTypeName", EhcacheConstant.retBean().getAlarmTypeNameByCodeNum(alarmType.get("alarmType").toString()));
-                    alarmType.put("deviceTypeName",EhcacheConstant.retBean().getDeviceTypeNameById(alarmType.get("deviceType").toString()));
+                    alarmType.put("deviceTypeName", EhcacheConstant.retBean().getDeviceTypeNameById(alarmType.get("deviceType").toString()));
                 }
         );
     }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/SysDictServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/SysDictServiceImpl.java
index 5ea6d1c..4885ee4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/SysDictServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/SysDictServiceImpl.java
@@ -38,7 +38,7 @@
 
     @Override
     public List<Map<String, Object>> getAlarmContent(String alarmType, String devType) {
-        return this.baseMapper.getAlarmContent(alarmType, devType);
+        return this.baseMapper.getAlarmContent(Long.valueOf(StrUtil.isEmpty(alarmType)?"-1":devType),Long.valueOf(StrUtil.isEmpty(devType)?"-1":devType) );
     }
 
     @Override

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
index 0bff8ec..66df59f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.util.EhcacheConstant;
@@ -21,7 +22,9 @@
     public ResponseData selectListPage(String alarmType, String deviceType, String alarmContent) {
         ResponseData responseData = new ResponseData();
         try {
-            List<Map<String, Object>> alarmContentTypeList = this.baseMapper.selectListPage(alarmType, deviceType, alarmContent);
+            List<Map<String, Object>> alarmContentTypeList = this.baseMapper.selectListPage(
+                    Long.valueOf(StrUtil.isEmpty(alarmType) ? "-1" : alarmType),
+                    Long.valueOf(StrUtil.isEmpty(deviceType) ? "-1" : deviceType), alarmContent);
             supplementData(alarmContentTypeList);
             responseData.setData(alarmContentTypeList);
             responseData.setMessage("success");
@@ -80,7 +83,7 @@
         alarmContentTypeList.forEach(
                 alarmType -> {
                     alarmType.put("alarmTypeName", EhcacheConstant.retBean().getAlarmTypeNameByCodeNum(alarmType.get("alarmType").toString()));
-                    alarmType.put("deviceTypeName",EhcacheConstant.retBean().getDeviceTypeNameById(alarmType.get("deviceType").toString()));
+                    alarmType.put("deviceTypeName", EhcacheConstant.retBean().getDeviceTypeNameById(alarmType.get("deviceType").toString()));
                 }
         );
     }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/SysDictServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/SysDictServiceImpl.java
index 5ea6d1c..4885ee4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/SysDictServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/SysDictServiceImpl.java
@@ -38,7 +38,7 @@
 
     @Override
     public List<Map<String, Object>> getAlarmContent(String alarmType, String devType) {
-        return this.baseMapper.getAlarmContent(alarmType, devType);
+        return this.baseMapper.getAlarmContent(Long.valueOf(StrUtil.isEmpty(alarmType)?"-1":devType),Long.valueOf(StrUtil.isEmpty(devType)?"-1":devType) );
     }
 
     @Override
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
index 6a75e47..5ca688d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
@@ -18,8 +18,8 @@
  */
 public interface AlarmContentTypeMapper extends BaseMapper<AlarmContentType> {
 
-    List<Map<String, Object>> selectListPage(@Param("alarmType") String alarmType,
-                                             @Param("deviceType") String deviceType,
+    List<Map<String, Object>> selectListPage(@Param("alarmType") Long alarmType,
+                                             @Param("deviceType") Long deviceType,
                                              @Param("alarmContent") String alarmContent);
 
 }

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
index 0bff8ec..66df59f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.util.EhcacheConstant;
@@ -21,7 +22,9 @@
     public ResponseData selectListPage(String alarmType, String deviceType, String alarmContent) {
         ResponseData responseData = new ResponseData();
         try {
-            List<Map<String, Object>> alarmContentTypeList = this.baseMapper.selectListPage(alarmType, deviceType, alarmContent);
+            List<Map<String, Object>> alarmContentTypeList = this.baseMapper.selectListPage(
+                    Long.valueOf(StrUtil.isEmpty(alarmType) ? "-1" : alarmType),
+                    Long.valueOf(StrUtil.isEmpty(deviceType) ? "-1" : deviceType), alarmContent);
             supplementData(alarmContentTypeList);
             responseData.setData(alarmContentTypeList);
             responseData.setMessage("success");
@@ -80,7 +83,7 @@
         alarmContentTypeList.forEach(
                 alarmType -> {
                     alarmType.put("alarmTypeName", EhcacheConstant.retBean().getAlarmTypeNameByCodeNum(alarmType.get("alarmType").toString()));
-                    alarmType.put("deviceTypeName",EhcacheConstant.retBean().getDeviceTypeNameById(alarmType.get("deviceType").toString()));
+                    alarmType.put("deviceTypeName", EhcacheConstant.retBean().getDeviceTypeNameById(alarmType.get("deviceType").toString()));
                 }
         );
     }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/SysDictServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/SysDictServiceImpl.java
index 5ea6d1c..4885ee4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/SysDictServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/SysDictServiceImpl.java
@@ -38,7 +38,7 @@
 
     @Override
     public List<Map<String, Object>> getAlarmContent(String alarmType, String devType) {
-        return this.baseMapper.getAlarmContent(alarmType, devType);
+        return this.baseMapper.getAlarmContent(Long.valueOf(StrUtil.isEmpty(alarmType)?"-1":devType),Long.valueOf(StrUtil.isEmpty(devType)?"-1":devType) );
     }
 
     @Override
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
index 6a75e47..5ca688d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
@@ -18,8 +18,8 @@
  */
 public interface AlarmContentTypeMapper extends BaseMapper<AlarmContentType> {
 
-    List<Map<String, Object>> selectListPage(@Param("alarmType") String alarmType,
-                                             @Param("deviceType") String deviceType,
+    List<Map<String, Object>> selectListPage(@Param("alarmType") Long alarmType,
+                                             @Param("deviceType") Long deviceType,
                                              @Param("alarmContent") String alarmContent);
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
index 2f9c47c..ae8fb6d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
@@ -22,7 +22,7 @@
 
     List<Map<String, Object>> getTypeViaCode(@Param("code") String code);
 
-    List<Map<String, Object>> getAlarmContent(@Param("alarmType") String alarmType, @Param("deviceType") String devType);
+    List<Map<String, Object>> getAlarmContent(@Param("alarmType") Long alarmType, @Param("deviceType") Long devType);
 
     List<Map<String, Object>> testPage(@Param("page") Page<Map<String, Object>> page);
 

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
index 0bff8ec..66df59f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.util.EhcacheConstant;
@@ -21,7 +22,9 @@
     public ResponseData selectListPage(String alarmType, String deviceType, String alarmContent) {
         ResponseData responseData = new ResponseData();
         try {
-            List<Map<String, Object>> alarmContentTypeList = this.baseMapper.selectListPage(alarmType, deviceType, alarmContent);
+            List<Map<String, Object>> alarmContentTypeList = this.baseMapper.selectListPage(
+                    Long.valueOf(StrUtil.isEmpty(alarmType) ? "-1" : alarmType),
+                    Long.valueOf(StrUtil.isEmpty(deviceType) ? "-1" : deviceType), alarmContent);
             supplementData(alarmContentTypeList);
             responseData.setData(alarmContentTypeList);
             responseData.setMessage("success");
@@ -80,7 +83,7 @@
         alarmContentTypeList.forEach(
                 alarmType -> {
                     alarmType.put("alarmTypeName", EhcacheConstant.retBean().getAlarmTypeNameByCodeNum(alarmType.get("alarmType").toString()));
-                    alarmType.put("deviceTypeName",EhcacheConstant.retBean().getDeviceTypeNameById(alarmType.get("deviceType").toString()));
+                    alarmType.put("deviceTypeName", EhcacheConstant.retBean().getDeviceTypeNameById(alarmType.get("deviceType").toString()));
                 }
         );
     }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/SysDictServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/SysDictServiceImpl.java
index 5ea6d1c..4885ee4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/SysDictServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/SysDictServiceImpl.java
@@ -38,7 +38,7 @@
 
     @Override
     public List<Map<String, Object>> getAlarmContent(String alarmType, String devType) {
-        return this.baseMapper.getAlarmContent(alarmType, devType);
+        return this.baseMapper.getAlarmContent(Long.valueOf(StrUtil.isEmpty(alarmType)?"-1":devType),Long.valueOf(StrUtil.isEmpty(devType)?"-1":devType) );
     }
 
     @Override
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
index 6a75e47..5ca688d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
@@ -18,8 +18,8 @@
  */
 public interface AlarmContentTypeMapper extends BaseMapper<AlarmContentType> {
 
-    List<Map<String, Object>> selectListPage(@Param("alarmType") String alarmType,
-                                             @Param("deviceType") String deviceType,
+    List<Map<String, Object>> selectListPage(@Param("alarmType") Long alarmType,
+                                             @Param("deviceType") Long deviceType,
                                              @Param("alarmContent") String alarmContent);
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
index 2f9c47c..ae8fb6d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
@@ -22,7 +22,7 @@
 
     List<Map<String, Object>> getTypeViaCode(@Param("code") String code);
 
-    List<Map<String, Object>> getAlarmContent(@Param("alarmType") String alarmType, @Param("deviceType") String devType);
+    List<Map<String, Object>> getAlarmContent(@Param("alarmType") Long alarmType, @Param("deviceType") Long devType);
 
     List<Map<String, Object>> testPage(@Param("page") Page<Map<String, Object>> page);
 
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 c8c28f7..a205e08 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
@@ -18,13 +18,13 @@
         ALARM_CONTENT AS "alarmContent",ID AS id
         FROM base_alarm_content_type
         WHERE 1=1
-        <if test="alarmType != null and alarmType !=''">
+        <if test="alarmType != null and alarmType !=-1">
             AND ALARM_TYPE= #{alarmType}
         </if>
         <if test="deviceType != null and deviceType !=''">
             AND DEVICE_TYPE = #{deviceType}
         </if>
-        <if test="alarmContent != null and alarmContent !=''">
+        <if test="alarmContent != null and alarmContent !=-1 ">
             AND ALARM_CONTENT like
             <include refid="keywords_sql"/>
         </if>

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
index 0bff8ec..66df59f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.util.EhcacheConstant;
@@ -21,7 +22,9 @@
     public ResponseData selectListPage(String alarmType, String deviceType, String alarmContent) {
         ResponseData responseData = new ResponseData();
         try {
-            List<Map<String, Object>> alarmContentTypeList = this.baseMapper.selectListPage(alarmType, deviceType, alarmContent);
+            List<Map<String, Object>> alarmContentTypeList = this.baseMapper.selectListPage(
+                    Long.valueOf(StrUtil.isEmpty(alarmType) ? "-1" : alarmType),
+                    Long.valueOf(StrUtil.isEmpty(deviceType) ? "-1" : deviceType), alarmContent);
             supplementData(alarmContentTypeList);
             responseData.setData(alarmContentTypeList);
             responseData.setMessage("success");
@@ -80,7 +83,7 @@
         alarmContentTypeList.forEach(
                 alarmType -> {
                     alarmType.put("alarmTypeName", EhcacheConstant.retBean().getAlarmTypeNameByCodeNum(alarmType.get("alarmType").toString()));
-                    alarmType.put("deviceTypeName",EhcacheConstant.retBean().getDeviceTypeNameById(alarmType.get("deviceType").toString()));
+                    alarmType.put("deviceTypeName", EhcacheConstant.retBean().getDeviceTypeNameById(alarmType.get("deviceType").toString()));
                 }
         );
     }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/SysDictServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/SysDictServiceImpl.java
index 5ea6d1c..4885ee4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/SysDictServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/SysDictServiceImpl.java
@@ -38,7 +38,7 @@
 
     @Override
     public List<Map<String, Object>> getAlarmContent(String alarmType, String devType) {
-        return this.baseMapper.getAlarmContent(alarmType, devType);
+        return this.baseMapper.getAlarmContent(Long.valueOf(StrUtil.isEmpty(alarmType)?"-1":devType),Long.valueOf(StrUtil.isEmpty(devType)?"-1":devType) );
     }
 
     @Override
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
index 6a75e47..5ca688d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
@@ -18,8 +18,8 @@
  */
 public interface AlarmContentTypeMapper extends BaseMapper<AlarmContentType> {
 
-    List<Map<String, Object>> selectListPage(@Param("alarmType") String alarmType,
-                                             @Param("deviceType") String deviceType,
+    List<Map<String, Object>> selectListPage(@Param("alarmType") Long alarmType,
+                                             @Param("deviceType") Long deviceType,
                                              @Param("alarmContent") String alarmContent);
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
index 2f9c47c..ae8fb6d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
@@ -22,7 +22,7 @@
 
     List<Map<String, Object>> getTypeViaCode(@Param("code") String code);
 
-    List<Map<String, Object>> getAlarmContent(@Param("alarmType") String alarmType, @Param("deviceType") String devType);
+    List<Map<String, Object>> getAlarmContent(@Param("alarmType") Long alarmType, @Param("deviceType") Long devType);
 
     List<Map<String, Object>> testPage(@Param("page") Page<Map<String, Object>> page);
 
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 c8c28f7..a205e08 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
@@ -18,13 +18,13 @@
         ALARM_CONTENT AS "alarmContent",ID AS id
         FROM base_alarm_content_type
         WHERE 1=1
-        <if test="alarmType != null and alarmType !=''">
+        <if test="alarmType != null and alarmType !=-1">
             AND ALARM_TYPE= #{alarmType}
         </if>
         <if test="deviceType != null and deviceType !=''">
             AND DEVICE_TYPE = #{deviceType}
         </if>
-        <if test="alarmContent != null and alarmContent !=''">
+        <if test="alarmContent != null and alarmContent !=-1 ">
             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 1d5bc2e..0c2387e 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
@@ -66,10 +66,13 @@
     <!--</select>    -->
     <select id="getAlarmContent" resultType="map">
         SELECT id as value,alarm_content as name ,alarm_type as "alarmType",
-                device_type as "deviceType"
+        device_type as "deviceType"
         FROM base_alarm_content_type
-        WHERE alarm_type = #{alarmType}
-        <if test="deviceType!=null and deviceType!=''">
+        WHERE 1=1
+        <if test="alarmType!=null and alarmType!=-1">
+            AND alarm_type = #{alarmType}]
+        </if>
+        <if test="deviceType!=null and deviceType!=-1'">
             AND device_type= #{deviceType}
         </if>
         order by id;

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
index 0bff8ec..66df59f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.util.EhcacheConstant;
@@ -21,7 +22,9 @@
     public ResponseData selectListPage(String alarmType, String deviceType, String alarmContent) {
         ResponseData responseData = new ResponseData();
         try {
-            List<Map<String, Object>> alarmContentTypeList = this.baseMapper.selectListPage(alarmType, deviceType, alarmContent);
+            List<Map<String, Object>> alarmContentTypeList = this.baseMapper.selectListPage(
+                    Long.valueOf(StrUtil.isEmpty(alarmType) ? "-1" : alarmType),
+                    Long.valueOf(StrUtil.isEmpty(deviceType) ? "-1" : deviceType), alarmContent);
             supplementData(alarmContentTypeList);
             responseData.setData(alarmContentTypeList);
             responseData.setMessage("success");
@@ -80,7 +83,7 @@
         alarmContentTypeList.forEach(
                 alarmType -> {
                     alarmType.put("alarmTypeName", EhcacheConstant.retBean().getAlarmTypeNameByCodeNum(alarmType.get("alarmType").toString()));
-                    alarmType.put("deviceTypeName",EhcacheConstant.retBean().getDeviceTypeNameById(alarmType.get("deviceType").toString()));
+                    alarmType.put("deviceTypeName", EhcacheConstant.retBean().getDeviceTypeNameById(alarmType.get("deviceType").toString()));
                 }
         );
     }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/SysDictServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/SysDictServiceImpl.java
index 5ea6d1c..4885ee4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/SysDictServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/SysDictServiceImpl.java
@@ -38,7 +38,7 @@
 
     @Override
     public List<Map<String, Object>> getAlarmContent(String alarmType, String devType) {
-        return this.baseMapper.getAlarmContent(alarmType, devType);
+        return this.baseMapper.getAlarmContent(Long.valueOf(StrUtil.isEmpty(alarmType)?"-1":devType),Long.valueOf(StrUtil.isEmpty(devType)?"-1":devType) );
     }
 
     @Override
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
index 6a75e47..5ca688d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
@@ -18,8 +18,8 @@
  */
 public interface AlarmContentTypeMapper extends BaseMapper<AlarmContentType> {
 
-    List<Map<String, Object>> selectListPage(@Param("alarmType") String alarmType,
-                                             @Param("deviceType") String deviceType,
+    List<Map<String, Object>> selectListPage(@Param("alarmType") Long alarmType,
+                                             @Param("deviceType") Long deviceType,
                                              @Param("alarmContent") String alarmContent);
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
index 2f9c47c..ae8fb6d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
@@ -22,7 +22,7 @@
 
     List<Map<String, Object>> getTypeViaCode(@Param("code") String code);
 
-    List<Map<String, Object>> getAlarmContent(@Param("alarmType") String alarmType, @Param("deviceType") String devType);
+    List<Map<String, Object>> getAlarmContent(@Param("alarmType") Long alarmType, @Param("deviceType") Long devType);
 
     List<Map<String, Object>> testPage(@Param("page") Page<Map<String, Object>> page);
 
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 c8c28f7..a205e08 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
@@ -18,13 +18,13 @@
         ALARM_CONTENT AS "alarmContent",ID AS id
         FROM base_alarm_content_type
         WHERE 1=1
-        <if test="alarmType != null and alarmType !=''">
+        <if test="alarmType != null and alarmType !=-1">
             AND ALARM_TYPE= #{alarmType}
         </if>
         <if test="deviceType != null and deviceType !=''">
             AND DEVICE_TYPE = #{deviceType}
         </if>
-        <if test="alarmContent != null and alarmContent !=''">
+        <if test="alarmContent != null and alarmContent !=-1 ">
             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 1d5bc2e..0c2387e 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
@@ -66,10 +66,13 @@
     <!--</select>    -->
     <select id="getAlarmContent" resultType="map">
         SELECT id as value,alarm_content as name ,alarm_type as "alarmType",
-                device_type as "deviceType"
+        device_type as "deviceType"
         FROM base_alarm_content_type
-        WHERE alarm_type = #{alarmType}
-        <if test="deviceType!=null and deviceType!=''">
+        WHERE 1=1
+        <if test="alarmType!=null and alarmType!=-1">
+            AND alarm_type = #{alarmType}]
+        </if>
+        <if test="deviceType!=null and deviceType!=-1'">
             AND device_type= #{deviceType}
         </if>
         order by id;
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
index b9627a5..bb20cc4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
@@ -187,6 +187,14 @@
         return responseData;
     }
 
+
+
+
+
+
+
+
+
     public Object getAlarmByStatus(String beginTime, String endTime, String alarmType) {
         ResponseData responseData = new ResponseData();
         Long deptId = permissionService.getAuthService().getLoginUser().getDeptId();

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
index 0bff8ec..66df59f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.util.EhcacheConstant;
@@ -21,7 +22,9 @@
     public ResponseData selectListPage(String alarmType, String deviceType, String alarmContent) {
         ResponseData responseData = new ResponseData();
         try {
-            List<Map<String, Object>> alarmContentTypeList = this.baseMapper.selectListPage(alarmType, deviceType, alarmContent);
+            List<Map<String, Object>> alarmContentTypeList = this.baseMapper.selectListPage(
+                    Long.valueOf(StrUtil.isEmpty(alarmType) ? "-1" : alarmType),
+                    Long.valueOf(StrUtil.isEmpty(deviceType) ? "-1" : deviceType), alarmContent);
             supplementData(alarmContentTypeList);
             responseData.setData(alarmContentTypeList);
             responseData.setMessage("success");
@@ -80,7 +83,7 @@
         alarmContentTypeList.forEach(
                 alarmType -> {
                     alarmType.put("alarmTypeName", EhcacheConstant.retBean().getAlarmTypeNameByCodeNum(alarmType.get("alarmType").toString()));
-                    alarmType.put("deviceTypeName",EhcacheConstant.retBean().getDeviceTypeNameById(alarmType.get("deviceType").toString()));
+                    alarmType.put("deviceTypeName", EhcacheConstant.retBean().getDeviceTypeNameById(alarmType.get("deviceType").toString()));
                 }
         );
     }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/SysDictServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/SysDictServiceImpl.java
index 5ea6d1c..4885ee4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/SysDictServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/SysDictServiceImpl.java
@@ -38,7 +38,7 @@
 
     @Override
     public List<Map<String, Object>> getAlarmContent(String alarmType, String devType) {
-        return this.baseMapper.getAlarmContent(alarmType, devType);
+        return this.baseMapper.getAlarmContent(Long.valueOf(StrUtil.isEmpty(alarmType)?"-1":devType),Long.valueOf(StrUtil.isEmpty(devType)?"-1":devType) );
     }
 
     @Override
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
index 6a75e47..5ca688d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
@@ -18,8 +18,8 @@
  */
 public interface AlarmContentTypeMapper extends BaseMapper<AlarmContentType> {
 
-    List<Map<String, Object>> selectListPage(@Param("alarmType") String alarmType,
-                                             @Param("deviceType") String deviceType,
+    List<Map<String, Object>> selectListPage(@Param("alarmType") Long alarmType,
+                                             @Param("deviceType") Long deviceType,
                                              @Param("alarmContent") String alarmContent);
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
index 2f9c47c..ae8fb6d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
@@ -22,7 +22,7 @@
 
     List<Map<String, Object>> getTypeViaCode(@Param("code") String code);
 
-    List<Map<String, Object>> getAlarmContent(@Param("alarmType") String alarmType, @Param("deviceType") String devType);
+    List<Map<String, Object>> getAlarmContent(@Param("alarmType") Long alarmType, @Param("deviceType") Long devType);
 
     List<Map<String, Object>> testPage(@Param("page") Page<Map<String, Object>> page);
 
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 c8c28f7..a205e08 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
@@ -18,13 +18,13 @@
         ALARM_CONTENT AS "alarmContent",ID AS id
         FROM base_alarm_content_type
         WHERE 1=1
-        <if test="alarmType != null and alarmType !=''">
+        <if test="alarmType != null and alarmType !=-1">
             AND ALARM_TYPE= #{alarmType}
         </if>
         <if test="deviceType != null and deviceType !=''">
             AND DEVICE_TYPE = #{deviceType}
         </if>
-        <if test="alarmContent != null and alarmContent !=''">
+        <if test="alarmContent != null and alarmContent !=-1 ">
             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 1d5bc2e..0c2387e 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
@@ -66,10 +66,13 @@
     <!--</select>    -->
     <select id="getAlarmContent" resultType="map">
         SELECT id as value,alarm_content as name ,alarm_type as "alarmType",
-                device_type as "deviceType"
+        device_type as "deviceType"
         FROM base_alarm_content_type
-        WHERE alarm_type = #{alarmType}
-        <if test="deviceType!=null and deviceType!=''">
+        WHERE 1=1
+        <if test="alarmType!=null and alarmType!=-1">
+            AND alarm_type = #{alarmType}]
+        </if>
+        <if test="deviceType!=null and deviceType!=-1'">
             AND device_type= #{deviceType}
         </if>
         order by id;
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
index b9627a5..bb20cc4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
@@ -187,6 +187,14 @@
         return responseData;
     }
 
+
+
+
+
+
+
+
+
     public Object getAlarmByStatus(String beginTime, String endTime, String alarmType) {
         ResponseData responseData = new ResponseData();
         Long deptId = permissionService.getAuthService().getLoginUser().getDeptId();
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
index 417d274..718f84f 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
@@ -20,9 +20,9 @@
  */
 public interface DeviceMapper extends BaseMapper<Device> {
 
-    List<DeviceDto> getDeviceList(@Param("scope") DataScope dataScope,@Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline);
+    List<DeviceDto> getDeviceList(@Param("scope") DataScope dataScope,@Param("deviceType") String deviceType, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline);
 
-    List<DeviceDto> selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page<DeviceDto> page, @Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline);
+    List<DeviceDto> selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page<DeviceDto> page, @Param("deviceType") String deviceType, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline);
 
     List<DeviceInfoDto> getDeviceListInfo(@Param("scope") DataScope dataScope);
 

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
index 0bff8ec..66df59f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.util.EhcacheConstant;
@@ -21,7 +22,9 @@
     public ResponseData selectListPage(String alarmType, String deviceType, String alarmContent) {
         ResponseData responseData = new ResponseData();
         try {
-            List<Map<String, Object>> alarmContentTypeList = this.baseMapper.selectListPage(alarmType, deviceType, alarmContent);
+            List<Map<String, Object>> alarmContentTypeList = this.baseMapper.selectListPage(
+                    Long.valueOf(StrUtil.isEmpty(alarmType) ? "-1" : alarmType),
+                    Long.valueOf(StrUtil.isEmpty(deviceType) ? "-1" : deviceType), alarmContent);
             supplementData(alarmContentTypeList);
             responseData.setData(alarmContentTypeList);
             responseData.setMessage("success");
@@ -80,7 +83,7 @@
         alarmContentTypeList.forEach(
                 alarmType -> {
                     alarmType.put("alarmTypeName", EhcacheConstant.retBean().getAlarmTypeNameByCodeNum(alarmType.get("alarmType").toString()));
-                    alarmType.put("deviceTypeName",EhcacheConstant.retBean().getDeviceTypeNameById(alarmType.get("deviceType").toString()));
+                    alarmType.put("deviceTypeName", EhcacheConstant.retBean().getDeviceTypeNameById(alarmType.get("deviceType").toString()));
                 }
         );
     }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/SysDictServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/SysDictServiceImpl.java
index 5ea6d1c..4885ee4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/SysDictServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/SysDictServiceImpl.java
@@ -38,7 +38,7 @@
 
     @Override
     public List<Map<String, Object>> getAlarmContent(String alarmType, String devType) {
-        return this.baseMapper.getAlarmContent(alarmType, devType);
+        return this.baseMapper.getAlarmContent(Long.valueOf(StrUtil.isEmpty(alarmType)?"-1":devType),Long.valueOf(StrUtil.isEmpty(devType)?"-1":devType) );
     }
 
     @Override
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
index 6a75e47..5ca688d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
@@ -18,8 +18,8 @@
  */
 public interface AlarmContentTypeMapper extends BaseMapper<AlarmContentType> {
 
-    List<Map<String, Object>> selectListPage(@Param("alarmType") String alarmType,
-                                             @Param("deviceType") String deviceType,
+    List<Map<String, Object>> selectListPage(@Param("alarmType") Long alarmType,
+                                             @Param("deviceType") Long deviceType,
                                              @Param("alarmContent") String alarmContent);
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
index 2f9c47c..ae8fb6d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
@@ -22,7 +22,7 @@
 
     List<Map<String, Object>> getTypeViaCode(@Param("code") String code);
 
-    List<Map<String, Object>> getAlarmContent(@Param("alarmType") String alarmType, @Param("deviceType") String devType);
+    List<Map<String, Object>> getAlarmContent(@Param("alarmType") Long alarmType, @Param("deviceType") Long devType);
 
     List<Map<String, Object>> testPage(@Param("page") Page<Map<String, Object>> page);
 
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 c8c28f7..a205e08 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
@@ -18,13 +18,13 @@
         ALARM_CONTENT AS "alarmContent",ID AS id
         FROM base_alarm_content_type
         WHERE 1=1
-        <if test="alarmType != null and alarmType !=''">
+        <if test="alarmType != null and alarmType !=-1">
             AND ALARM_TYPE= #{alarmType}
         </if>
         <if test="deviceType != null and deviceType !=''">
             AND DEVICE_TYPE = #{deviceType}
         </if>
-        <if test="alarmContent != null and alarmContent !=''">
+        <if test="alarmContent != null and alarmContent !=-1 ">
             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 1d5bc2e..0c2387e 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
@@ -66,10 +66,13 @@
     <!--</select>    -->
     <select id="getAlarmContent" resultType="map">
         SELECT id as value,alarm_content as name ,alarm_type as "alarmType",
-                device_type as "deviceType"
+        device_type as "deviceType"
         FROM base_alarm_content_type
-        WHERE alarm_type = #{alarmType}
-        <if test="deviceType!=null and deviceType!=''">
+        WHERE 1=1
+        <if test="alarmType!=null and alarmType!=-1">
+            AND alarm_type = #{alarmType}]
+        </if>
+        <if test="deviceType!=null and deviceType!=-1'">
             AND device_type= #{deviceType}
         </if>
         order by id;
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
index b9627a5..bb20cc4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
@@ -187,6 +187,14 @@
         return responseData;
     }
 
+
+
+
+
+
+
+
+
     public Object getAlarmByStatus(String beginTime, String endTime, String alarmType) {
         ResponseData responseData = new ResponseData();
         Long deptId = permissionService.getAuthService().getLoginUser().getDeptId();
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
index 417d274..718f84f 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
@@ -20,9 +20,9 @@
  */
 public interface DeviceMapper extends BaseMapper<Device> {
 
-    List<DeviceDto> getDeviceList(@Param("scope") DataScope dataScope,@Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline);
+    List<DeviceDto> getDeviceList(@Param("scope") DataScope dataScope,@Param("deviceType") String deviceType, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline);
 
-    List<DeviceDto> selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page<DeviceDto> page, @Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline);
+    List<DeviceDto> selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page<DeviceDto> page, @Param("deviceType") String deviceType, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline);
 
     List<DeviceInfoDto> getDeviceListInfo(@Param("scope") DataScope dataScope);
 
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 ef2f571..07761de 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
@@ -119,7 +119,7 @@
         <if test="deviceType != null and deviceType !=''">
             and deviceType = #{deviceType}
         </if>
-        <if test="deptid != null and deptid !=''">
+        <if test="deptid != null and deptid !=-1">
             and deptid = #{deptid}
         </if>
         <if test="isOnline != null and isOnline !='' and  isOnline !='1'">
@@ -160,7 +160,7 @@
         <if test="deviceType != null and deviceType !=''">
             and deviceType = #{deviceType}
         </if>
-        <if test="deptid != null and deptid !=''">
+        <if test="deptid != null and deptid != -1">
             and deptid = #{deptid}
         </if>
         <if test="isOnline != null and isOnline !='' and  isOnline !='1'">

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
index 0bff8ec..66df59f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.util.EhcacheConstant;
@@ -21,7 +22,9 @@
     public ResponseData selectListPage(String alarmType, String deviceType, String alarmContent) {
         ResponseData responseData = new ResponseData();
         try {
-            List<Map<String, Object>> alarmContentTypeList = this.baseMapper.selectListPage(alarmType, deviceType, alarmContent);
+            List<Map<String, Object>> alarmContentTypeList = this.baseMapper.selectListPage(
+                    Long.valueOf(StrUtil.isEmpty(alarmType) ? "-1" : alarmType),
+                    Long.valueOf(StrUtil.isEmpty(deviceType) ? "-1" : deviceType), alarmContent);
             supplementData(alarmContentTypeList);
             responseData.setData(alarmContentTypeList);
             responseData.setMessage("success");
@@ -80,7 +83,7 @@
         alarmContentTypeList.forEach(
                 alarmType -> {
                     alarmType.put("alarmTypeName", EhcacheConstant.retBean().getAlarmTypeNameByCodeNum(alarmType.get("alarmType").toString()));
-                    alarmType.put("deviceTypeName",EhcacheConstant.retBean().getDeviceTypeNameById(alarmType.get("deviceType").toString()));
+                    alarmType.put("deviceTypeName", EhcacheConstant.retBean().getDeviceTypeNameById(alarmType.get("deviceType").toString()));
                 }
         );
     }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/SysDictServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/SysDictServiceImpl.java
index 5ea6d1c..4885ee4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/SysDictServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/SysDictServiceImpl.java
@@ -38,7 +38,7 @@
 
     @Override
     public List<Map<String, Object>> getAlarmContent(String alarmType, String devType) {
-        return this.baseMapper.getAlarmContent(alarmType, devType);
+        return this.baseMapper.getAlarmContent(Long.valueOf(StrUtil.isEmpty(alarmType)?"-1":devType),Long.valueOf(StrUtil.isEmpty(devType)?"-1":devType) );
     }
 
     @Override
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
index 6a75e47..5ca688d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
@@ -18,8 +18,8 @@
  */
 public interface AlarmContentTypeMapper extends BaseMapper<AlarmContentType> {
 
-    List<Map<String, Object>> selectListPage(@Param("alarmType") String alarmType,
-                                             @Param("deviceType") String deviceType,
+    List<Map<String, Object>> selectListPage(@Param("alarmType") Long alarmType,
+                                             @Param("deviceType") Long deviceType,
                                              @Param("alarmContent") String alarmContent);
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
index 2f9c47c..ae8fb6d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
@@ -22,7 +22,7 @@
 
     List<Map<String, Object>> getTypeViaCode(@Param("code") String code);
 
-    List<Map<String, Object>> getAlarmContent(@Param("alarmType") String alarmType, @Param("deviceType") String devType);
+    List<Map<String, Object>> getAlarmContent(@Param("alarmType") Long alarmType, @Param("deviceType") Long devType);
 
     List<Map<String, Object>> testPage(@Param("page") Page<Map<String, Object>> page);
 
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 c8c28f7..a205e08 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
@@ -18,13 +18,13 @@
         ALARM_CONTENT AS "alarmContent",ID AS id
         FROM base_alarm_content_type
         WHERE 1=1
-        <if test="alarmType != null and alarmType !=''">
+        <if test="alarmType != null and alarmType !=-1">
             AND ALARM_TYPE= #{alarmType}
         </if>
         <if test="deviceType != null and deviceType !=''">
             AND DEVICE_TYPE = #{deviceType}
         </if>
-        <if test="alarmContent != null and alarmContent !=''">
+        <if test="alarmContent != null and alarmContent !=-1 ">
             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 1d5bc2e..0c2387e 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
@@ -66,10 +66,13 @@
     <!--</select>    -->
     <select id="getAlarmContent" resultType="map">
         SELECT id as value,alarm_content as name ,alarm_type as "alarmType",
-                device_type as "deviceType"
+        device_type as "deviceType"
         FROM base_alarm_content_type
-        WHERE alarm_type = #{alarmType}
-        <if test="deviceType!=null and deviceType!=''">
+        WHERE 1=1
+        <if test="alarmType!=null and alarmType!=-1">
+            AND alarm_type = #{alarmType}]
+        </if>
+        <if test="deviceType!=null and deviceType!=-1'">
             AND device_type= #{deviceType}
         </if>
         order by id;
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
index b9627a5..bb20cc4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
@@ -187,6 +187,14 @@
         return responseData;
     }
 
+
+
+
+
+
+
+
+
     public Object getAlarmByStatus(String beginTime, String endTime, String alarmType) {
         ResponseData responseData = new ResponseData();
         Long deptId = permissionService.getAuthService().getLoginUser().getDeptId();
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
index 417d274..718f84f 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
@@ -20,9 +20,9 @@
  */
 public interface DeviceMapper extends BaseMapper<Device> {
 
-    List<DeviceDto> getDeviceList(@Param("scope") DataScope dataScope,@Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline);
+    List<DeviceDto> getDeviceList(@Param("scope") DataScope dataScope,@Param("deviceType") String deviceType, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline);
 
-    List<DeviceDto> selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page<DeviceDto> page, @Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline);
+    List<DeviceDto> selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page<DeviceDto> page, @Param("deviceType") String deviceType, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline);
 
     List<DeviceInfoDto> getDeviceListInfo(@Param("scope") DataScope dataScope);
 
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 ef2f571..07761de 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
@@ -119,7 +119,7 @@
         <if test="deviceType != null and deviceType !=''">
             and deviceType = #{deviceType}
         </if>
-        <if test="deptid != null and deptid !=''">
+        <if test="deptid != null and deptid !=-1">
             and deptid = #{deptid}
         </if>
         <if test="isOnline != null and isOnline !='' and  isOnline !='1'">
@@ -160,7 +160,7 @@
         <if test="deviceType != null and deviceType !=''">
             and deviceType = #{deviceType}
         </if>
-        <if test="deptid != null and deptid !=''">
+        <if test="deptid != null and deptid != -1">
             and deptid = #{deptid}
         </if>
         <if test="isOnline != null and isOnline !='' and  isOnline !='1'">
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
index a6aee1c..99db8fc 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
@@ -71,7 +71,7 @@
      * @return
      */
     public List<DeviceDto> getDeviceList(DataScope dataScope, String deviceType, String deptid, String beginTime, String endTime, String keywords, String isOnline) {
-        return this.baseMapper.getDeviceList(dataScope, deviceType, deptid, beginTime, endTime, keywords, isOnline);
+        return this.baseMapper.getDeviceList(dataScope, deviceType, Long.valueOf(StrUtil.isEmpty(deptid) ? "-1" : deptid), beginTime, endTime, keywords, isOnline);
     }
 
     /**
@@ -189,7 +189,7 @@
 
     @Override
     public List<DeviceDto> selectDataScopePage(DataScope dataScope, Page<DeviceDto> page, String deviceType, String deptid, String beginTime, String endTime, String keywords, String isOnline) {
-        return this.baseMapper.selectDataScopePage(dataScope, page, deviceType, deptid, beginTime, endTime, keywords, isOnline);
+        return this.baseMapper.selectDataScopePage(dataScope, page, deviceType, Long.valueOf(StrUtil.isEmpty(deptid) ? "-1" : deptid), beginTime, endTime, keywords, isOnline);
     }
 
     @Override

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
index 0bff8ec..66df59f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.util.EhcacheConstant;
@@ -21,7 +22,9 @@
     public ResponseData selectListPage(String alarmType, String deviceType, String alarmContent) {
         ResponseData responseData = new ResponseData();
         try {
-            List<Map<String, Object>> alarmContentTypeList = this.baseMapper.selectListPage(alarmType, deviceType, alarmContent);
+            List<Map<String, Object>> alarmContentTypeList = this.baseMapper.selectListPage(
+                    Long.valueOf(StrUtil.isEmpty(alarmType) ? "-1" : alarmType),
+                    Long.valueOf(StrUtil.isEmpty(deviceType) ? "-1" : deviceType), alarmContent);
             supplementData(alarmContentTypeList);
             responseData.setData(alarmContentTypeList);
             responseData.setMessage("success");
@@ -80,7 +83,7 @@
         alarmContentTypeList.forEach(
                 alarmType -> {
                     alarmType.put("alarmTypeName", EhcacheConstant.retBean().getAlarmTypeNameByCodeNum(alarmType.get("alarmType").toString()));
-                    alarmType.put("deviceTypeName",EhcacheConstant.retBean().getDeviceTypeNameById(alarmType.get("deviceType").toString()));
+                    alarmType.put("deviceTypeName", EhcacheConstant.retBean().getDeviceTypeNameById(alarmType.get("deviceType").toString()));
                 }
         );
     }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/SysDictServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/SysDictServiceImpl.java
index 5ea6d1c..4885ee4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/SysDictServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/SysDictServiceImpl.java
@@ -38,7 +38,7 @@
 
     @Override
     public List<Map<String, Object>> getAlarmContent(String alarmType, String devType) {
-        return this.baseMapper.getAlarmContent(alarmType, devType);
+        return this.baseMapper.getAlarmContent(Long.valueOf(StrUtil.isEmpty(alarmType)?"-1":devType),Long.valueOf(StrUtil.isEmpty(devType)?"-1":devType) );
     }
 
     @Override
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
index 6a75e47..5ca688d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
@@ -18,8 +18,8 @@
  */
 public interface AlarmContentTypeMapper extends BaseMapper<AlarmContentType> {
 
-    List<Map<String, Object>> selectListPage(@Param("alarmType") String alarmType,
-                                             @Param("deviceType") String deviceType,
+    List<Map<String, Object>> selectListPage(@Param("alarmType") Long alarmType,
+                                             @Param("deviceType") Long deviceType,
                                              @Param("alarmContent") String alarmContent);
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
index 2f9c47c..ae8fb6d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
@@ -22,7 +22,7 @@
 
     List<Map<String, Object>> getTypeViaCode(@Param("code") String code);
 
-    List<Map<String, Object>> getAlarmContent(@Param("alarmType") String alarmType, @Param("deviceType") String devType);
+    List<Map<String, Object>> getAlarmContent(@Param("alarmType") Long alarmType, @Param("deviceType") Long devType);
 
     List<Map<String, Object>> testPage(@Param("page") Page<Map<String, Object>> page);
 
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 c8c28f7..a205e08 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
@@ -18,13 +18,13 @@
         ALARM_CONTENT AS "alarmContent",ID AS id
         FROM base_alarm_content_type
         WHERE 1=1
-        <if test="alarmType != null and alarmType !=''">
+        <if test="alarmType != null and alarmType !=-1">
             AND ALARM_TYPE= #{alarmType}
         </if>
         <if test="deviceType != null and deviceType !=''">
             AND DEVICE_TYPE = #{deviceType}
         </if>
-        <if test="alarmContent != null and alarmContent !=''">
+        <if test="alarmContent != null and alarmContent !=-1 ">
             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 1d5bc2e..0c2387e 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
@@ -66,10 +66,13 @@
     <!--</select>    -->
     <select id="getAlarmContent" resultType="map">
         SELECT id as value,alarm_content as name ,alarm_type as "alarmType",
-                device_type as "deviceType"
+        device_type as "deviceType"
         FROM base_alarm_content_type
-        WHERE alarm_type = #{alarmType}
-        <if test="deviceType!=null and deviceType!=''">
+        WHERE 1=1
+        <if test="alarmType!=null and alarmType!=-1">
+            AND alarm_type = #{alarmType}]
+        </if>
+        <if test="deviceType!=null and deviceType!=-1'">
             AND device_type= #{deviceType}
         </if>
         order by id;
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
index b9627a5..bb20cc4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
@@ -187,6 +187,14 @@
         return responseData;
     }
 
+
+
+
+
+
+
+
+
     public Object getAlarmByStatus(String beginTime, String endTime, String alarmType) {
         ResponseData responseData = new ResponseData();
         Long deptId = permissionService.getAuthService().getLoginUser().getDeptId();
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
index 417d274..718f84f 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
@@ -20,9 +20,9 @@
  */
 public interface DeviceMapper extends BaseMapper<Device> {
 
-    List<DeviceDto> getDeviceList(@Param("scope") DataScope dataScope,@Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline);
+    List<DeviceDto> getDeviceList(@Param("scope") DataScope dataScope,@Param("deviceType") String deviceType, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline);
 
-    List<DeviceDto> selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page<DeviceDto> page, @Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline);
+    List<DeviceDto> selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page<DeviceDto> page, @Param("deviceType") String deviceType, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline);
 
     List<DeviceInfoDto> getDeviceListInfo(@Param("scope") DataScope dataScope);
 
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 ef2f571..07761de 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
@@ -119,7 +119,7 @@
         <if test="deviceType != null and deviceType !=''">
             and deviceType = #{deviceType}
         </if>
-        <if test="deptid != null and deptid !=''">
+        <if test="deptid != null and deptid !=-1">
             and deptid = #{deptid}
         </if>
         <if test="isOnline != null and isOnline !='' and  isOnline !='1'">
@@ -160,7 +160,7 @@
         <if test="deviceType != null and deviceType !=''">
             and deviceType = #{deviceType}
         </if>
-        <if test="deptid != null and deptid !=''">
+        <if test="deptid != null and deptid != -1">
             and deptid = #{deptid}
         </if>
         <if test="isOnline != null and isOnline !='' and  isOnline !='1'">
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
index a6aee1c..99db8fc 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
@@ -71,7 +71,7 @@
      * @return
      */
     public List<DeviceDto> getDeviceList(DataScope dataScope, String deviceType, String deptid, String beginTime, String endTime, String keywords, String isOnline) {
-        return this.baseMapper.getDeviceList(dataScope, deviceType, deptid, beginTime, endTime, keywords, isOnline);
+        return this.baseMapper.getDeviceList(dataScope, deviceType, Long.valueOf(StrUtil.isEmpty(deptid) ? "-1" : deptid), beginTime, endTime, keywords, isOnline);
     }
 
     /**
@@ -189,7 +189,7 @@
 
     @Override
     public List<DeviceDto> selectDataScopePage(DataScope dataScope, Page<DeviceDto> page, String deviceType, String deptid, String beginTime, String endTime, String keywords, String isOnline) {
-        return this.baseMapper.selectDataScopePage(dataScope, page, deviceType, deptid, beginTime, endTime, keywords, isOnline);
+        return this.baseMapper.selectDataScopePage(dataScope, page, deviceType, Long.valueOf(StrUtil.isEmpty(deptid) ? "-1" : deptid), beginTime, endTime, keywords, isOnline);
     }
 
     @Override
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/dept/dao/BusDeptUserMapper.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/dept/dao/BusDeptUserMapper.java
index 307e413..c79684a 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/dept/dao/BusDeptUserMapper.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/dept/dao/BusDeptUserMapper.java
@@ -17,5 +17,5 @@
  * @since 2020-05-07
  */
 public interface BusDeptUserMapper extends BaseMapper<BusDeptUser> {
-    List<DeptUserView> selectDeptUserList(@Param("deptType") String deptType, @Param("deptName") String deptName);
+    List<DeptUserView> selectDeptUserList(@Param("deptType") Long deptType, @Param("deptName") String deptName);
 }

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
index 0bff8ec..66df59f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.util.EhcacheConstant;
@@ -21,7 +22,9 @@
     public ResponseData selectListPage(String alarmType, String deviceType, String alarmContent) {
         ResponseData responseData = new ResponseData();
         try {
-            List<Map<String, Object>> alarmContentTypeList = this.baseMapper.selectListPage(alarmType, deviceType, alarmContent);
+            List<Map<String, Object>> alarmContentTypeList = this.baseMapper.selectListPage(
+                    Long.valueOf(StrUtil.isEmpty(alarmType) ? "-1" : alarmType),
+                    Long.valueOf(StrUtil.isEmpty(deviceType) ? "-1" : deviceType), alarmContent);
             supplementData(alarmContentTypeList);
             responseData.setData(alarmContentTypeList);
             responseData.setMessage("success");
@@ -80,7 +83,7 @@
         alarmContentTypeList.forEach(
                 alarmType -> {
                     alarmType.put("alarmTypeName", EhcacheConstant.retBean().getAlarmTypeNameByCodeNum(alarmType.get("alarmType").toString()));
-                    alarmType.put("deviceTypeName",EhcacheConstant.retBean().getDeviceTypeNameById(alarmType.get("deviceType").toString()));
+                    alarmType.put("deviceTypeName", EhcacheConstant.retBean().getDeviceTypeNameById(alarmType.get("deviceType").toString()));
                 }
         );
     }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/SysDictServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/SysDictServiceImpl.java
index 5ea6d1c..4885ee4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/SysDictServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/SysDictServiceImpl.java
@@ -38,7 +38,7 @@
 
     @Override
     public List<Map<String, Object>> getAlarmContent(String alarmType, String devType) {
-        return this.baseMapper.getAlarmContent(alarmType, devType);
+        return this.baseMapper.getAlarmContent(Long.valueOf(StrUtil.isEmpty(alarmType)?"-1":devType),Long.valueOf(StrUtil.isEmpty(devType)?"-1":devType) );
     }
 
     @Override
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
index 6a75e47..5ca688d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
@@ -18,8 +18,8 @@
  */
 public interface AlarmContentTypeMapper extends BaseMapper<AlarmContentType> {
 
-    List<Map<String, Object>> selectListPage(@Param("alarmType") String alarmType,
-                                             @Param("deviceType") String deviceType,
+    List<Map<String, Object>> selectListPage(@Param("alarmType") Long alarmType,
+                                             @Param("deviceType") Long deviceType,
                                              @Param("alarmContent") String alarmContent);
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
index 2f9c47c..ae8fb6d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
@@ -22,7 +22,7 @@
 
     List<Map<String, Object>> getTypeViaCode(@Param("code") String code);
 
-    List<Map<String, Object>> getAlarmContent(@Param("alarmType") String alarmType, @Param("deviceType") String devType);
+    List<Map<String, Object>> getAlarmContent(@Param("alarmType") Long alarmType, @Param("deviceType") Long devType);
 
     List<Map<String, Object>> testPage(@Param("page") Page<Map<String, Object>> page);
 
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 c8c28f7..a205e08 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
@@ -18,13 +18,13 @@
         ALARM_CONTENT AS "alarmContent",ID AS id
         FROM base_alarm_content_type
         WHERE 1=1
-        <if test="alarmType != null and alarmType !=''">
+        <if test="alarmType != null and alarmType !=-1">
             AND ALARM_TYPE= #{alarmType}
         </if>
         <if test="deviceType != null and deviceType !=''">
             AND DEVICE_TYPE = #{deviceType}
         </if>
-        <if test="alarmContent != null and alarmContent !=''">
+        <if test="alarmContent != null and alarmContent !=-1 ">
             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 1d5bc2e..0c2387e 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
@@ -66,10 +66,13 @@
     <!--</select>    -->
     <select id="getAlarmContent" resultType="map">
         SELECT id as value,alarm_content as name ,alarm_type as "alarmType",
-                device_type as "deviceType"
+        device_type as "deviceType"
         FROM base_alarm_content_type
-        WHERE alarm_type = #{alarmType}
-        <if test="deviceType!=null and deviceType!=''">
+        WHERE 1=1
+        <if test="alarmType!=null and alarmType!=-1">
+            AND alarm_type = #{alarmType}]
+        </if>
+        <if test="deviceType!=null and deviceType!=-1'">
             AND device_type= #{deviceType}
         </if>
         order by id;
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
index b9627a5..bb20cc4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
@@ -187,6 +187,14 @@
         return responseData;
     }
 
+
+
+
+
+
+
+
+
     public Object getAlarmByStatus(String beginTime, String endTime, String alarmType) {
         ResponseData responseData = new ResponseData();
         Long deptId = permissionService.getAuthService().getLoginUser().getDeptId();
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
index 417d274..718f84f 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
@@ -20,9 +20,9 @@
  */
 public interface DeviceMapper extends BaseMapper<Device> {
 
-    List<DeviceDto> getDeviceList(@Param("scope") DataScope dataScope,@Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline);
+    List<DeviceDto> getDeviceList(@Param("scope") DataScope dataScope,@Param("deviceType") String deviceType, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline);
 
-    List<DeviceDto> selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page<DeviceDto> page, @Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline);
+    List<DeviceDto> selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page<DeviceDto> page, @Param("deviceType") String deviceType, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline);
 
     List<DeviceInfoDto> getDeviceListInfo(@Param("scope") DataScope dataScope);
 
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 ef2f571..07761de 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
@@ -119,7 +119,7 @@
         <if test="deviceType != null and deviceType !=''">
             and deviceType = #{deviceType}
         </if>
-        <if test="deptid != null and deptid !=''">
+        <if test="deptid != null and deptid !=-1">
             and deptid = #{deptid}
         </if>
         <if test="isOnline != null and isOnline !='' and  isOnline !='1'">
@@ -160,7 +160,7 @@
         <if test="deviceType != null and deviceType !=''">
             and deviceType = #{deviceType}
         </if>
-        <if test="deptid != null and deptid !=''">
+        <if test="deptid != null and deptid != -1">
             and deptid = #{deptid}
         </if>
         <if test="isOnline != null and isOnline !='' and  isOnline !='1'">
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
index a6aee1c..99db8fc 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
@@ -71,7 +71,7 @@
      * @return
      */
     public List<DeviceDto> getDeviceList(DataScope dataScope, String deviceType, String deptid, String beginTime, String endTime, String keywords, String isOnline) {
-        return this.baseMapper.getDeviceList(dataScope, deviceType, deptid, beginTime, endTime, keywords, isOnline);
+        return this.baseMapper.getDeviceList(dataScope, deviceType, Long.valueOf(StrUtil.isEmpty(deptid) ? "-1" : deptid), beginTime, endTime, keywords, isOnline);
     }
 
     /**
@@ -189,7 +189,7 @@
 
     @Override
     public List<DeviceDto> selectDataScopePage(DataScope dataScope, Page<DeviceDto> page, String deviceType, String deptid, String beginTime, String endTime, String keywords, String isOnline) {
-        return this.baseMapper.selectDataScopePage(dataScope, page, deviceType, deptid, beginTime, endTime, keywords, isOnline);
+        return this.baseMapper.selectDataScopePage(dataScope, page, deviceType, Long.valueOf(StrUtil.isEmpty(deptid) ? "-1" : deptid), beginTime, endTime, keywords, isOnline);
     }
 
     @Override
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/dept/dao/BusDeptUserMapper.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/dept/dao/BusDeptUserMapper.java
index 307e413..c79684a 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/dept/dao/BusDeptUserMapper.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/dept/dao/BusDeptUserMapper.java
@@ -17,5 +17,5 @@
  * @since 2020-05-07
  */
 public interface BusDeptUserMapper extends BaseMapper<BusDeptUser> {
-    List<DeptUserView> selectDeptUserList(@Param("deptType") String deptType, @Param("deptName") String deptName);
+    List<DeptUserView> selectDeptUserList(@Param("deptType") Long deptType, @Param("deptName") String deptName);
 }
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/dept/dao/mapping/BusDeptUserMapper.xml b/casic-sluicewell/src/main/java/com/casic/missiles/modular/dept/dao/mapping/BusDeptUserMapper.xml
index 9cde3cc..37adcf8 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/dept/dao/mapping/BusDeptUserMapper.xml
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/dept/dao/mapping/BusDeptUserMapper.xml
@@ -34,7 +34,7 @@
                  AND (fullname LIKE CONCAT('%',#{deptName},'%')
                  OR simplename LIKE CONCAT('%',#{deptName},'%'))
              </if>
-             <if test="deptType != null and deptType != ''">
+             <if test="deptType != null and deptType != -1 ">
                  AND deptType = #{deptType}
              </if>
          </where>

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
index 0bff8ec..66df59f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.util.EhcacheConstant;
@@ -21,7 +22,9 @@
     public ResponseData selectListPage(String alarmType, String deviceType, String alarmContent) {
         ResponseData responseData = new ResponseData();
         try {
-            List<Map<String, Object>> alarmContentTypeList = this.baseMapper.selectListPage(alarmType, deviceType, alarmContent);
+            List<Map<String, Object>> alarmContentTypeList = this.baseMapper.selectListPage(
+                    Long.valueOf(StrUtil.isEmpty(alarmType) ? "-1" : alarmType),
+                    Long.valueOf(StrUtil.isEmpty(deviceType) ? "-1" : deviceType), alarmContent);
             supplementData(alarmContentTypeList);
             responseData.setData(alarmContentTypeList);
             responseData.setMessage("success");
@@ -80,7 +83,7 @@
         alarmContentTypeList.forEach(
                 alarmType -> {
                     alarmType.put("alarmTypeName", EhcacheConstant.retBean().getAlarmTypeNameByCodeNum(alarmType.get("alarmType").toString()));
-                    alarmType.put("deviceTypeName",EhcacheConstant.retBean().getDeviceTypeNameById(alarmType.get("deviceType").toString()));
+                    alarmType.put("deviceTypeName", EhcacheConstant.retBean().getDeviceTypeNameById(alarmType.get("deviceType").toString()));
                 }
         );
     }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/SysDictServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/SysDictServiceImpl.java
index 5ea6d1c..4885ee4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/SysDictServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/SysDictServiceImpl.java
@@ -38,7 +38,7 @@
 
     @Override
     public List<Map<String, Object>> getAlarmContent(String alarmType, String devType) {
-        return this.baseMapper.getAlarmContent(alarmType, devType);
+        return this.baseMapper.getAlarmContent(Long.valueOf(StrUtil.isEmpty(alarmType)?"-1":devType),Long.valueOf(StrUtil.isEmpty(devType)?"-1":devType) );
     }
 
     @Override
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
index 6a75e47..5ca688d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
@@ -18,8 +18,8 @@
  */
 public interface AlarmContentTypeMapper extends BaseMapper<AlarmContentType> {
 
-    List<Map<String, Object>> selectListPage(@Param("alarmType") String alarmType,
-                                             @Param("deviceType") String deviceType,
+    List<Map<String, Object>> selectListPage(@Param("alarmType") Long alarmType,
+                                             @Param("deviceType") Long deviceType,
                                              @Param("alarmContent") String alarmContent);
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
index 2f9c47c..ae8fb6d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
@@ -22,7 +22,7 @@
 
     List<Map<String, Object>> getTypeViaCode(@Param("code") String code);
 
-    List<Map<String, Object>> getAlarmContent(@Param("alarmType") String alarmType, @Param("deviceType") String devType);
+    List<Map<String, Object>> getAlarmContent(@Param("alarmType") Long alarmType, @Param("deviceType") Long devType);
 
     List<Map<String, Object>> testPage(@Param("page") Page<Map<String, Object>> page);
 
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 c8c28f7..a205e08 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
@@ -18,13 +18,13 @@
         ALARM_CONTENT AS "alarmContent",ID AS id
         FROM base_alarm_content_type
         WHERE 1=1
-        <if test="alarmType != null and alarmType !=''">
+        <if test="alarmType != null and alarmType !=-1">
             AND ALARM_TYPE= #{alarmType}
         </if>
         <if test="deviceType != null and deviceType !=''">
             AND DEVICE_TYPE = #{deviceType}
         </if>
-        <if test="alarmContent != null and alarmContent !=''">
+        <if test="alarmContent != null and alarmContent !=-1 ">
             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 1d5bc2e..0c2387e 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
@@ -66,10 +66,13 @@
     <!--</select>    -->
     <select id="getAlarmContent" resultType="map">
         SELECT id as value,alarm_content as name ,alarm_type as "alarmType",
-                device_type as "deviceType"
+        device_type as "deviceType"
         FROM base_alarm_content_type
-        WHERE alarm_type = #{alarmType}
-        <if test="deviceType!=null and deviceType!=''">
+        WHERE 1=1
+        <if test="alarmType!=null and alarmType!=-1">
+            AND alarm_type = #{alarmType}]
+        </if>
+        <if test="deviceType!=null and deviceType!=-1'">
             AND device_type= #{deviceType}
         </if>
         order by id;
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
index b9627a5..bb20cc4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
@@ -187,6 +187,14 @@
         return responseData;
     }
 
+
+
+
+
+
+
+
+
     public Object getAlarmByStatus(String beginTime, String endTime, String alarmType) {
         ResponseData responseData = new ResponseData();
         Long deptId = permissionService.getAuthService().getLoginUser().getDeptId();
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
index 417d274..718f84f 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
@@ -20,9 +20,9 @@
  */
 public interface DeviceMapper extends BaseMapper<Device> {
 
-    List<DeviceDto> getDeviceList(@Param("scope") DataScope dataScope,@Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline);
+    List<DeviceDto> getDeviceList(@Param("scope") DataScope dataScope,@Param("deviceType") String deviceType, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline);
 
-    List<DeviceDto> selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page<DeviceDto> page, @Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline);
+    List<DeviceDto> selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page<DeviceDto> page, @Param("deviceType") String deviceType, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline);
 
     List<DeviceInfoDto> getDeviceListInfo(@Param("scope") DataScope dataScope);
 
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 ef2f571..07761de 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
@@ -119,7 +119,7 @@
         <if test="deviceType != null and deviceType !=''">
             and deviceType = #{deviceType}
         </if>
-        <if test="deptid != null and deptid !=''">
+        <if test="deptid != null and deptid !=-1">
             and deptid = #{deptid}
         </if>
         <if test="isOnline != null and isOnline !='' and  isOnline !='1'">
@@ -160,7 +160,7 @@
         <if test="deviceType != null and deviceType !=''">
             and deviceType = #{deviceType}
         </if>
-        <if test="deptid != null and deptid !=''">
+        <if test="deptid != null and deptid != -1">
             and deptid = #{deptid}
         </if>
         <if test="isOnline != null and isOnline !='' and  isOnline !='1'">
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
index a6aee1c..99db8fc 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
@@ -71,7 +71,7 @@
      * @return
      */
     public List<DeviceDto> getDeviceList(DataScope dataScope, String deviceType, String deptid, String beginTime, String endTime, String keywords, String isOnline) {
-        return this.baseMapper.getDeviceList(dataScope, deviceType, deptid, beginTime, endTime, keywords, isOnline);
+        return this.baseMapper.getDeviceList(dataScope, deviceType, Long.valueOf(StrUtil.isEmpty(deptid) ? "-1" : deptid), beginTime, endTime, keywords, isOnline);
     }
 
     /**
@@ -189,7 +189,7 @@
 
     @Override
     public List<DeviceDto> selectDataScopePage(DataScope dataScope, Page<DeviceDto> page, String deviceType, String deptid, String beginTime, String endTime, String keywords, String isOnline) {
-        return this.baseMapper.selectDataScopePage(dataScope, page, deviceType, deptid, beginTime, endTime, keywords, isOnline);
+        return this.baseMapper.selectDataScopePage(dataScope, page, deviceType, Long.valueOf(StrUtil.isEmpty(deptid) ? "-1" : deptid), beginTime, endTime, keywords, isOnline);
     }
 
     @Override
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/dept/dao/BusDeptUserMapper.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/dept/dao/BusDeptUserMapper.java
index 307e413..c79684a 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/dept/dao/BusDeptUserMapper.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/dept/dao/BusDeptUserMapper.java
@@ -17,5 +17,5 @@
  * @since 2020-05-07
  */
 public interface BusDeptUserMapper extends BaseMapper<BusDeptUser> {
-    List<DeptUserView> selectDeptUserList(@Param("deptType") String deptType, @Param("deptName") String deptName);
+    List<DeptUserView> selectDeptUserList(@Param("deptType") Long deptType, @Param("deptName") String deptName);
 }
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/dept/dao/mapping/BusDeptUserMapper.xml b/casic-sluicewell/src/main/java/com/casic/missiles/modular/dept/dao/mapping/BusDeptUserMapper.xml
index 9cde3cc..37adcf8 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/dept/dao/mapping/BusDeptUserMapper.xml
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/dept/dao/mapping/BusDeptUserMapper.xml
@@ -34,7 +34,7 @@
                  AND (fullname LIKE CONCAT('%',#{deptName},'%')
                  OR simplename LIKE CONCAT('%',#{deptName},'%'))
              </if>
-             <if test="deptType != null and deptType != ''">
+             <if test="deptType != null and deptType != -1 ">
                  AND deptType = #{deptType}
              </if>
          </where>
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/dept/service/impl/BusDeptUserServiceImpl.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/dept/service/impl/BusDeptUserServiceImpl.java
index 22c5b6a..3682642 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/dept/service/impl/BusDeptUserServiceImpl.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/dept/service/impl/BusDeptUserServiceImpl.java
@@ -1,12 +1,14 @@
 package com.casic.missiles.modular.dept.service.impl;
 
 
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.modular.dept.dao.BusDeptUserMapper;
 import com.casic.missiles.modular.dept.dto.DeptUserView;
 import com.casic.missiles.modular.dept.model.BusDeptUser;
 import com.casic.missiles.modular.dept.service.IBusDeptUserService;
+import com.mchange.v2.lang.StringUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -28,7 +30,7 @@
 
     @Override
     public List<DeptUserView> selectDeptUserList(String deptType, String deptName) {
-        List<DeptUserView> deptUserViews = this.baseMapper.selectDeptUserList(deptType, deptName);
+        List<DeptUserView> deptUserViews = this.baseMapper.selectDeptUserList(Long.valueOf( StrUtil.isEmpty(deptType)?"-1":deptType), deptName);
         for (DeptUserView deptUserView : deptUserViews) {
             deptUserView.setpName(permissionService.getDeptService().getDeptName(deptUserView.getPid()));
         }

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
index 0bff8ec..66df59f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.util.EhcacheConstant;
@@ -21,7 +22,9 @@
     public ResponseData selectListPage(String alarmType, String deviceType, String alarmContent) {
         ResponseData responseData = new ResponseData();
         try {
-            List<Map<String, Object>> alarmContentTypeList = this.baseMapper.selectListPage(alarmType, deviceType, alarmContent);
+            List<Map<String, Object>> alarmContentTypeList = this.baseMapper.selectListPage(
+                    Long.valueOf(StrUtil.isEmpty(alarmType) ? "-1" : alarmType),
+                    Long.valueOf(StrUtil.isEmpty(deviceType) ? "-1" : deviceType), alarmContent);
             supplementData(alarmContentTypeList);
             responseData.setData(alarmContentTypeList);
             responseData.setMessage("success");
@@ -80,7 +83,7 @@
         alarmContentTypeList.forEach(
                 alarmType -> {
                     alarmType.put("alarmTypeName", EhcacheConstant.retBean().getAlarmTypeNameByCodeNum(alarmType.get("alarmType").toString()));
-                    alarmType.put("deviceTypeName",EhcacheConstant.retBean().getDeviceTypeNameById(alarmType.get("deviceType").toString()));
+                    alarmType.put("deviceTypeName", EhcacheConstant.retBean().getDeviceTypeNameById(alarmType.get("deviceType").toString()));
                 }
         );
     }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/SysDictServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/SysDictServiceImpl.java
index 5ea6d1c..4885ee4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/SysDictServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/SysDictServiceImpl.java
@@ -38,7 +38,7 @@
 
     @Override
     public List<Map<String, Object>> getAlarmContent(String alarmType, String devType) {
-        return this.baseMapper.getAlarmContent(alarmType, devType);
+        return this.baseMapper.getAlarmContent(Long.valueOf(StrUtil.isEmpty(alarmType)?"-1":devType),Long.valueOf(StrUtil.isEmpty(devType)?"-1":devType) );
     }
 
     @Override
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
index 6a75e47..5ca688d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
@@ -18,8 +18,8 @@
  */
 public interface AlarmContentTypeMapper extends BaseMapper<AlarmContentType> {
 
-    List<Map<String, Object>> selectListPage(@Param("alarmType") String alarmType,
-                                             @Param("deviceType") String deviceType,
+    List<Map<String, Object>> selectListPage(@Param("alarmType") Long alarmType,
+                                             @Param("deviceType") Long deviceType,
                                              @Param("alarmContent") String alarmContent);
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
index 2f9c47c..ae8fb6d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
@@ -22,7 +22,7 @@
 
     List<Map<String, Object>> getTypeViaCode(@Param("code") String code);
 
-    List<Map<String, Object>> getAlarmContent(@Param("alarmType") String alarmType, @Param("deviceType") String devType);
+    List<Map<String, Object>> getAlarmContent(@Param("alarmType") Long alarmType, @Param("deviceType") Long devType);
 
     List<Map<String, Object>> testPage(@Param("page") Page<Map<String, Object>> page);
 
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 c8c28f7..a205e08 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
@@ -18,13 +18,13 @@
         ALARM_CONTENT AS "alarmContent",ID AS id
         FROM base_alarm_content_type
         WHERE 1=1
-        <if test="alarmType != null and alarmType !=''">
+        <if test="alarmType != null and alarmType !=-1">
             AND ALARM_TYPE= #{alarmType}
         </if>
         <if test="deviceType != null and deviceType !=''">
             AND DEVICE_TYPE = #{deviceType}
         </if>
-        <if test="alarmContent != null and alarmContent !=''">
+        <if test="alarmContent != null and alarmContent !=-1 ">
             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 1d5bc2e..0c2387e 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
@@ -66,10 +66,13 @@
     <!--</select>    -->
     <select id="getAlarmContent" resultType="map">
         SELECT id as value,alarm_content as name ,alarm_type as "alarmType",
-                device_type as "deviceType"
+        device_type as "deviceType"
         FROM base_alarm_content_type
-        WHERE alarm_type = #{alarmType}
-        <if test="deviceType!=null and deviceType!=''">
+        WHERE 1=1
+        <if test="alarmType!=null and alarmType!=-1">
+            AND alarm_type = #{alarmType}]
+        </if>
+        <if test="deviceType!=null and deviceType!=-1'">
             AND device_type= #{deviceType}
         </if>
         order by id;
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
index b9627a5..bb20cc4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
@@ -187,6 +187,14 @@
         return responseData;
     }
 
+
+
+
+
+
+
+
+
     public Object getAlarmByStatus(String beginTime, String endTime, String alarmType) {
         ResponseData responseData = new ResponseData();
         Long deptId = permissionService.getAuthService().getLoginUser().getDeptId();
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
index 417d274..718f84f 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
@@ -20,9 +20,9 @@
  */
 public interface DeviceMapper extends BaseMapper<Device> {
 
-    List<DeviceDto> getDeviceList(@Param("scope") DataScope dataScope,@Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline);
+    List<DeviceDto> getDeviceList(@Param("scope") DataScope dataScope,@Param("deviceType") String deviceType, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline);
 
-    List<DeviceDto> selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page<DeviceDto> page, @Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline);
+    List<DeviceDto> selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page<DeviceDto> page, @Param("deviceType") String deviceType, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline);
 
     List<DeviceInfoDto> getDeviceListInfo(@Param("scope") DataScope dataScope);
 
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 ef2f571..07761de 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
@@ -119,7 +119,7 @@
         <if test="deviceType != null and deviceType !=''">
             and deviceType = #{deviceType}
         </if>
-        <if test="deptid != null and deptid !=''">
+        <if test="deptid != null and deptid !=-1">
             and deptid = #{deptid}
         </if>
         <if test="isOnline != null and isOnline !='' and  isOnline !='1'">
@@ -160,7 +160,7 @@
         <if test="deviceType != null and deviceType !=''">
             and deviceType = #{deviceType}
         </if>
-        <if test="deptid != null and deptid !=''">
+        <if test="deptid != null and deptid != -1">
             and deptid = #{deptid}
         </if>
         <if test="isOnline != null and isOnline !='' and  isOnline !='1'">
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
index a6aee1c..99db8fc 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
@@ -71,7 +71,7 @@
      * @return
      */
     public List<DeviceDto> getDeviceList(DataScope dataScope, String deviceType, String deptid, String beginTime, String endTime, String keywords, String isOnline) {
-        return this.baseMapper.getDeviceList(dataScope, deviceType, deptid, beginTime, endTime, keywords, isOnline);
+        return this.baseMapper.getDeviceList(dataScope, deviceType, Long.valueOf(StrUtil.isEmpty(deptid) ? "-1" : deptid), beginTime, endTime, keywords, isOnline);
     }
 
     /**
@@ -189,7 +189,7 @@
 
     @Override
     public List<DeviceDto> selectDataScopePage(DataScope dataScope, Page<DeviceDto> page, String deviceType, String deptid, String beginTime, String endTime, String keywords, String isOnline) {
-        return this.baseMapper.selectDataScopePage(dataScope, page, deviceType, deptid, beginTime, endTime, keywords, isOnline);
+        return this.baseMapper.selectDataScopePage(dataScope, page, deviceType, Long.valueOf(StrUtil.isEmpty(deptid) ? "-1" : deptid), beginTime, endTime, keywords, isOnline);
     }
 
     @Override
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/dept/dao/BusDeptUserMapper.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/dept/dao/BusDeptUserMapper.java
index 307e413..c79684a 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/dept/dao/BusDeptUserMapper.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/dept/dao/BusDeptUserMapper.java
@@ -17,5 +17,5 @@
  * @since 2020-05-07
  */
 public interface BusDeptUserMapper extends BaseMapper<BusDeptUser> {
-    List<DeptUserView> selectDeptUserList(@Param("deptType") String deptType, @Param("deptName") String deptName);
+    List<DeptUserView> selectDeptUserList(@Param("deptType") Long deptType, @Param("deptName") String deptName);
 }
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/dept/dao/mapping/BusDeptUserMapper.xml b/casic-sluicewell/src/main/java/com/casic/missiles/modular/dept/dao/mapping/BusDeptUserMapper.xml
index 9cde3cc..37adcf8 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/dept/dao/mapping/BusDeptUserMapper.xml
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/dept/dao/mapping/BusDeptUserMapper.xml
@@ -34,7 +34,7 @@
                  AND (fullname LIKE CONCAT('%',#{deptName},'%')
                  OR simplename LIKE CONCAT('%',#{deptName},'%'))
              </if>
-             <if test="deptType != null and deptType != ''">
+             <if test="deptType != null and deptType != -1 ">
                  AND deptType = #{deptType}
              </if>
          </where>
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/dept/service/impl/BusDeptUserServiceImpl.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/dept/service/impl/BusDeptUserServiceImpl.java
index 22c5b6a..3682642 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/dept/service/impl/BusDeptUserServiceImpl.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/dept/service/impl/BusDeptUserServiceImpl.java
@@ -1,12 +1,14 @@
 package com.casic.missiles.modular.dept.service.impl;
 
 
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.modular.dept.dao.BusDeptUserMapper;
 import com.casic.missiles.modular.dept.dto.DeptUserView;
 import com.casic.missiles.modular.dept.model.BusDeptUser;
 import com.casic.missiles.modular.dept.service.IBusDeptUserService;
+import com.mchange.v2.lang.StringUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -28,7 +30,7 @@
 
     @Override
     public List<DeptUserView> selectDeptUserList(String deptType, String deptName) {
-        List<DeptUserView> deptUserViews = this.baseMapper.selectDeptUserList(deptType, deptName);
+        List<DeptUserView> deptUserViews = this.baseMapper.selectDeptUserList(Long.valueOf( StrUtil.isEmpty(deptType)?"-1":deptType), deptName);
         for (DeptUserView deptUserView : deptUserViews) {
             deptUserView.setpName(permissionService.getDeptService().getDeptName(deptUserView.getPid()));
         }
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java
index 89f9586..3746665 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java
@@ -19,7 +19,7 @@
  */
 public interface BusWellInfoMapper extends BaseMapper<BusWellInfo> {
 
-    List<BusWellInfo> selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page<BusWellInfo> page, @Param("keywords") String keywords, @Param("wellType") String wellType, @Param("deptid") String deptid, @Param("bfzt") String bfzt);
+    List<BusWellInfo> selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page<BusWellInfo> page, @Param("keywords") String keywords, @Param("wellType") String wellType, @Param("deptid") Long  deptid, @Param("bfzt") String bfzt);
 
 
 

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
index 0bff8ec..66df59f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.util.EhcacheConstant;
@@ -21,7 +22,9 @@
     public ResponseData selectListPage(String alarmType, String deviceType, String alarmContent) {
         ResponseData responseData = new ResponseData();
         try {
-            List<Map<String, Object>> alarmContentTypeList = this.baseMapper.selectListPage(alarmType, deviceType, alarmContent);
+            List<Map<String, Object>> alarmContentTypeList = this.baseMapper.selectListPage(
+                    Long.valueOf(StrUtil.isEmpty(alarmType) ? "-1" : alarmType),
+                    Long.valueOf(StrUtil.isEmpty(deviceType) ? "-1" : deviceType), alarmContent);
             supplementData(alarmContentTypeList);
             responseData.setData(alarmContentTypeList);
             responseData.setMessage("success");
@@ -80,7 +83,7 @@
         alarmContentTypeList.forEach(
                 alarmType -> {
                     alarmType.put("alarmTypeName", EhcacheConstant.retBean().getAlarmTypeNameByCodeNum(alarmType.get("alarmType").toString()));
-                    alarmType.put("deviceTypeName",EhcacheConstant.retBean().getDeviceTypeNameById(alarmType.get("deviceType").toString()));
+                    alarmType.put("deviceTypeName", EhcacheConstant.retBean().getDeviceTypeNameById(alarmType.get("deviceType").toString()));
                 }
         );
     }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/SysDictServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/SysDictServiceImpl.java
index 5ea6d1c..4885ee4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/SysDictServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/SysDictServiceImpl.java
@@ -38,7 +38,7 @@
 
     @Override
     public List<Map<String, Object>> getAlarmContent(String alarmType, String devType) {
-        return this.baseMapper.getAlarmContent(alarmType, devType);
+        return this.baseMapper.getAlarmContent(Long.valueOf(StrUtil.isEmpty(alarmType)?"-1":devType),Long.valueOf(StrUtil.isEmpty(devType)?"-1":devType) );
     }
 
     @Override
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
index 6a75e47..5ca688d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
@@ -18,8 +18,8 @@
  */
 public interface AlarmContentTypeMapper extends BaseMapper<AlarmContentType> {
 
-    List<Map<String, Object>> selectListPage(@Param("alarmType") String alarmType,
-                                             @Param("deviceType") String deviceType,
+    List<Map<String, Object>> selectListPage(@Param("alarmType") Long alarmType,
+                                             @Param("deviceType") Long deviceType,
                                              @Param("alarmContent") String alarmContent);
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
index 2f9c47c..ae8fb6d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
@@ -22,7 +22,7 @@
 
     List<Map<String, Object>> getTypeViaCode(@Param("code") String code);
 
-    List<Map<String, Object>> getAlarmContent(@Param("alarmType") String alarmType, @Param("deviceType") String devType);
+    List<Map<String, Object>> getAlarmContent(@Param("alarmType") Long alarmType, @Param("deviceType") Long devType);
 
     List<Map<String, Object>> testPage(@Param("page") Page<Map<String, Object>> page);
 
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 c8c28f7..a205e08 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
@@ -18,13 +18,13 @@
         ALARM_CONTENT AS "alarmContent",ID AS id
         FROM base_alarm_content_type
         WHERE 1=1
-        <if test="alarmType != null and alarmType !=''">
+        <if test="alarmType != null and alarmType !=-1">
             AND ALARM_TYPE= #{alarmType}
         </if>
         <if test="deviceType != null and deviceType !=''">
             AND DEVICE_TYPE = #{deviceType}
         </if>
-        <if test="alarmContent != null and alarmContent !=''">
+        <if test="alarmContent != null and alarmContent !=-1 ">
             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 1d5bc2e..0c2387e 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
@@ -66,10 +66,13 @@
     <!--</select>    -->
     <select id="getAlarmContent" resultType="map">
         SELECT id as value,alarm_content as name ,alarm_type as "alarmType",
-                device_type as "deviceType"
+        device_type as "deviceType"
         FROM base_alarm_content_type
-        WHERE alarm_type = #{alarmType}
-        <if test="deviceType!=null and deviceType!=''">
+        WHERE 1=1
+        <if test="alarmType!=null and alarmType!=-1">
+            AND alarm_type = #{alarmType}]
+        </if>
+        <if test="deviceType!=null and deviceType!=-1'">
             AND device_type= #{deviceType}
         </if>
         order by id;
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
index b9627a5..bb20cc4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
@@ -187,6 +187,14 @@
         return responseData;
     }
 
+
+
+
+
+
+
+
+
     public Object getAlarmByStatus(String beginTime, String endTime, String alarmType) {
         ResponseData responseData = new ResponseData();
         Long deptId = permissionService.getAuthService().getLoginUser().getDeptId();
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
index 417d274..718f84f 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
@@ -20,9 +20,9 @@
  */
 public interface DeviceMapper extends BaseMapper<Device> {
 
-    List<DeviceDto> getDeviceList(@Param("scope") DataScope dataScope,@Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline);
+    List<DeviceDto> getDeviceList(@Param("scope") DataScope dataScope,@Param("deviceType") String deviceType, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline);
 
-    List<DeviceDto> selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page<DeviceDto> page, @Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline);
+    List<DeviceDto> selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page<DeviceDto> page, @Param("deviceType") String deviceType, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline);
 
     List<DeviceInfoDto> getDeviceListInfo(@Param("scope") DataScope dataScope);
 
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 ef2f571..07761de 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
@@ -119,7 +119,7 @@
         <if test="deviceType != null and deviceType !=''">
             and deviceType = #{deviceType}
         </if>
-        <if test="deptid != null and deptid !=''">
+        <if test="deptid != null and deptid !=-1">
             and deptid = #{deptid}
         </if>
         <if test="isOnline != null and isOnline !='' and  isOnline !='1'">
@@ -160,7 +160,7 @@
         <if test="deviceType != null and deviceType !=''">
             and deviceType = #{deviceType}
         </if>
-        <if test="deptid != null and deptid !=''">
+        <if test="deptid != null and deptid != -1">
             and deptid = #{deptid}
         </if>
         <if test="isOnline != null and isOnline !='' and  isOnline !='1'">
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
index a6aee1c..99db8fc 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
@@ -71,7 +71,7 @@
      * @return
      */
     public List<DeviceDto> getDeviceList(DataScope dataScope, String deviceType, String deptid, String beginTime, String endTime, String keywords, String isOnline) {
-        return this.baseMapper.getDeviceList(dataScope, deviceType, deptid, beginTime, endTime, keywords, isOnline);
+        return this.baseMapper.getDeviceList(dataScope, deviceType, Long.valueOf(StrUtil.isEmpty(deptid) ? "-1" : deptid), beginTime, endTime, keywords, isOnline);
     }
 
     /**
@@ -189,7 +189,7 @@
 
     @Override
     public List<DeviceDto> selectDataScopePage(DataScope dataScope, Page<DeviceDto> page, String deviceType, String deptid, String beginTime, String endTime, String keywords, String isOnline) {
-        return this.baseMapper.selectDataScopePage(dataScope, page, deviceType, deptid, beginTime, endTime, keywords, isOnline);
+        return this.baseMapper.selectDataScopePage(dataScope, page, deviceType, Long.valueOf(StrUtil.isEmpty(deptid) ? "-1" : deptid), beginTime, endTime, keywords, isOnline);
     }
 
     @Override
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/dept/dao/BusDeptUserMapper.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/dept/dao/BusDeptUserMapper.java
index 307e413..c79684a 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/dept/dao/BusDeptUserMapper.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/dept/dao/BusDeptUserMapper.java
@@ -17,5 +17,5 @@
  * @since 2020-05-07
  */
 public interface BusDeptUserMapper extends BaseMapper<BusDeptUser> {
-    List<DeptUserView> selectDeptUserList(@Param("deptType") String deptType, @Param("deptName") String deptName);
+    List<DeptUserView> selectDeptUserList(@Param("deptType") Long deptType, @Param("deptName") String deptName);
 }
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/dept/dao/mapping/BusDeptUserMapper.xml b/casic-sluicewell/src/main/java/com/casic/missiles/modular/dept/dao/mapping/BusDeptUserMapper.xml
index 9cde3cc..37adcf8 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/dept/dao/mapping/BusDeptUserMapper.xml
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/dept/dao/mapping/BusDeptUserMapper.xml
@@ -34,7 +34,7 @@
                  AND (fullname LIKE CONCAT('%',#{deptName},'%')
                  OR simplename LIKE CONCAT('%',#{deptName},'%'))
              </if>
-             <if test="deptType != null and deptType != ''">
+             <if test="deptType != null and deptType != -1 ">
                  AND deptType = #{deptType}
              </if>
          </where>
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/dept/service/impl/BusDeptUserServiceImpl.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/dept/service/impl/BusDeptUserServiceImpl.java
index 22c5b6a..3682642 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/dept/service/impl/BusDeptUserServiceImpl.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/dept/service/impl/BusDeptUserServiceImpl.java
@@ -1,12 +1,14 @@
 package com.casic.missiles.modular.dept.service.impl;
 
 
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.modular.dept.dao.BusDeptUserMapper;
 import com.casic.missiles.modular.dept.dto.DeptUserView;
 import com.casic.missiles.modular.dept.model.BusDeptUser;
 import com.casic.missiles.modular.dept.service.IBusDeptUserService;
+import com.mchange.v2.lang.StringUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -28,7 +30,7 @@
 
     @Override
     public List<DeptUserView> selectDeptUserList(String deptType, String deptName) {
-        List<DeptUserView> deptUserViews = this.baseMapper.selectDeptUserList(deptType, deptName);
+        List<DeptUserView> deptUserViews = this.baseMapper.selectDeptUserList(Long.valueOf( StrUtil.isEmpty(deptType)?"-1":deptType), deptName);
         for (DeptUserView deptUserView : deptUserViews) {
             deptUserView.setpName(permissionService.getDeptService().getDeptName(deptUserView.getPid()));
         }
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java
index 89f9586..3746665 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java
@@ -19,7 +19,7 @@
  */
 public interface BusWellInfoMapper extends BaseMapper<BusWellInfo> {
 
-    List<BusWellInfo> selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page<BusWellInfo> page, @Param("keywords") String keywords, @Param("wellType") String wellType, @Param("deptid") String deptid, @Param("bfzt") String bfzt);
+    List<BusWellInfo> selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page<BusWellInfo> page, @Param("keywords") String keywords, @Param("wellType") String wellType, @Param("deptid") Long  deptid, @Param("bfzt") String bfzt);
 
 
 
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml
index bed957f..924d2fa 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml
@@ -72,7 +72,7 @@
         <if test="wellType != null and wellType !=''">
             and w.well_Type = #{wellType}
         </if>
-        <if test="deptid != null and deptid !=''">
+        <if test="deptid != null and deptid !=-1 ">
             and w.deptid = #{deptid}
         </if>
         <if test="bfzt != null and bfzt != '' ">

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
index 0bff8ec..66df59f 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmContentTypeServiceImpl.java
@@ -1,5 +1,6 @@
 package com.casic.missiles.modular.alarm.service.impl;
 
+import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.util.EhcacheConstant;
@@ -21,7 +22,9 @@
     public ResponseData selectListPage(String alarmType, String deviceType, String alarmContent) {
         ResponseData responseData = new ResponseData();
         try {
-            List<Map<String, Object>> alarmContentTypeList = this.baseMapper.selectListPage(alarmType, deviceType, alarmContent);
+            List<Map<String, Object>> alarmContentTypeList = this.baseMapper.selectListPage(
+                    Long.valueOf(StrUtil.isEmpty(alarmType) ? "-1" : alarmType),
+                    Long.valueOf(StrUtil.isEmpty(deviceType) ? "-1" : deviceType), alarmContent);
             supplementData(alarmContentTypeList);
             responseData.setData(alarmContentTypeList);
             responseData.setMessage("success");
@@ -80,7 +83,7 @@
         alarmContentTypeList.forEach(
                 alarmType -> {
                     alarmType.put("alarmTypeName", EhcacheConstant.retBean().getAlarmTypeNameByCodeNum(alarmType.get("alarmType").toString()));
-                    alarmType.put("deviceTypeName",EhcacheConstant.retBean().getDeviceTypeNameById(alarmType.get("deviceType").toString()));
+                    alarmType.put("deviceTypeName", EhcacheConstant.retBean().getDeviceTypeNameById(alarmType.get("deviceType").toString()));
                 }
         );
     }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/SysDictServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/SysDictServiceImpl.java
index 5ea6d1c..4885ee4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/SysDictServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/SysDictServiceImpl.java
@@ -38,7 +38,7 @@
 
     @Override
     public List<Map<String, Object>> getAlarmContent(String alarmType, String devType) {
-        return this.baseMapper.getAlarmContent(alarmType, devType);
+        return this.baseMapper.getAlarmContent(Long.valueOf(StrUtil.isEmpty(alarmType)?"-1":devType),Long.valueOf(StrUtil.isEmpty(devType)?"-1":devType) );
     }
 
     @Override
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
index 6a75e47..5ca688d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmContentTypeMapper.java
@@ -18,8 +18,8 @@
  */
 public interface AlarmContentTypeMapper extends BaseMapper<AlarmContentType> {
 
-    List<Map<String, Object>> selectListPage(@Param("alarmType") String alarmType,
-                                             @Param("deviceType") String deviceType,
+    List<Map<String, Object>> selectListPage(@Param("alarmType") Long alarmType,
+                                             @Param("deviceType") Long deviceType,
                                              @Param("alarmContent") String alarmContent);
 
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
index 2f9c47c..ae8fb6d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
@@ -22,7 +22,7 @@
 
     List<Map<String, Object>> getTypeViaCode(@Param("code") String code);
 
-    List<Map<String, Object>> getAlarmContent(@Param("alarmType") String alarmType, @Param("deviceType") String devType);
+    List<Map<String, Object>> getAlarmContent(@Param("alarmType") Long alarmType, @Param("deviceType") Long devType);
 
     List<Map<String, Object>> testPage(@Param("page") Page<Map<String, Object>> page);
 
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 c8c28f7..a205e08 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
@@ -18,13 +18,13 @@
         ALARM_CONTENT AS "alarmContent",ID AS id
         FROM base_alarm_content_type
         WHERE 1=1
-        <if test="alarmType != null and alarmType !=''">
+        <if test="alarmType != null and alarmType !=-1">
             AND ALARM_TYPE= #{alarmType}
         </if>
         <if test="deviceType != null and deviceType !=''">
             AND DEVICE_TYPE = #{deviceType}
         </if>
-        <if test="alarmContent != null and alarmContent !=''">
+        <if test="alarmContent != null and alarmContent !=-1 ">
             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 1d5bc2e..0c2387e 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
@@ -66,10 +66,13 @@
     <!--</select>    -->
     <select id="getAlarmContent" resultType="map">
         SELECT id as value,alarm_content as name ,alarm_type as "alarmType",
-                device_type as "deviceType"
+        device_type as "deviceType"
         FROM base_alarm_content_type
-        WHERE alarm_type = #{alarmType}
-        <if test="deviceType!=null and deviceType!=''">
+        WHERE 1=1
+        <if test="alarmType!=null and alarmType!=-1">
+            AND alarm_type = #{alarmType}]
+        </if>
+        <if test="deviceType!=null and deviceType!=-1'">
             AND device_type= #{deviceType}
         </if>
         order by id;
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
index b9627a5..bb20cc4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/StatisticServiceImpl.java
@@ -187,6 +187,14 @@
         return responseData;
     }
 
+
+
+
+
+
+
+
+
     public Object getAlarmByStatus(String beginTime, String endTime, String alarmType) {
         ResponseData responseData = new ResponseData();
         Long deptId = permissionService.getAuthService().getLoginUser().getDeptId();
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
index 417d274..718f84f 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/dao/DeviceMapper.java
@@ -20,9 +20,9 @@
  */
 public interface DeviceMapper extends BaseMapper<Device> {
 
-    List<DeviceDto> getDeviceList(@Param("scope") DataScope dataScope,@Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline);
+    List<DeviceDto> getDeviceList(@Param("scope") DataScope dataScope,@Param("deviceType") String deviceType, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline);
 
-    List<DeviceDto> selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page<DeviceDto> page, @Param("deviceType") String deviceType, @Param("deptid") String deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline);
+    List<DeviceDto> selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page<DeviceDto> page, @Param("deviceType") String deviceType, @Param("deptid") Long deptid, @Param("beginTime") String beginTime, @Param("endTime") String endTime, @Param("keywords") String keywords, @Param("isOnline") String isOnline);
 
     List<DeviceInfoDto> getDeviceListInfo(@Param("scope") DataScope dataScope);
 
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 ef2f571..07761de 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
@@ -119,7 +119,7 @@
         <if test="deviceType != null and deviceType !=''">
             and deviceType = #{deviceType}
         </if>
-        <if test="deptid != null and deptid !=''">
+        <if test="deptid != null and deptid !=-1">
             and deptid = #{deptid}
         </if>
         <if test="isOnline != null and isOnline !='' and  isOnline !='1'">
@@ -160,7 +160,7 @@
         <if test="deviceType != null and deviceType !=''">
             and deviceType = #{deviceType}
         </if>
-        <if test="deptid != null and deptid !=''">
+        <if test="deptid != null and deptid != -1">
             and deptid = #{deptid}
         </if>
         <if test="isOnline != null and isOnline !='' and  isOnline !='1'">
diff --git a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
index a6aee1c..99db8fc 100644
--- a/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
+++ b/casic-device/src/main/java/com/casic/missiles/modular/system/service/impl/DeviceServiceImpl.java
@@ -71,7 +71,7 @@
      * @return
      */
     public List<DeviceDto> getDeviceList(DataScope dataScope, String deviceType, String deptid, String beginTime, String endTime, String keywords, String isOnline) {
-        return this.baseMapper.getDeviceList(dataScope, deviceType, deptid, beginTime, endTime, keywords, isOnline);
+        return this.baseMapper.getDeviceList(dataScope, deviceType, Long.valueOf(StrUtil.isEmpty(deptid) ? "-1" : deptid), beginTime, endTime, keywords, isOnline);
     }
 
     /**
@@ -189,7 +189,7 @@
 
     @Override
     public List<DeviceDto> selectDataScopePage(DataScope dataScope, Page<DeviceDto> page, String deviceType, String deptid, String beginTime, String endTime, String keywords, String isOnline) {
-        return this.baseMapper.selectDataScopePage(dataScope, page, deviceType, deptid, beginTime, endTime, keywords, isOnline);
+        return this.baseMapper.selectDataScopePage(dataScope, page, deviceType, Long.valueOf(StrUtil.isEmpty(deptid) ? "-1" : deptid), beginTime, endTime, keywords, isOnline);
     }
 
     @Override
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/dept/dao/BusDeptUserMapper.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/dept/dao/BusDeptUserMapper.java
index 307e413..c79684a 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/dept/dao/BusDeptUserMapper.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/dept/dao/BusDeptUserMapper.java
@@ -17,5 +17,5 @@
  * @since 2020-05-07
  */
 public interface BusDeptUserMapper extends BaseMapper<BusDeptUser> {
-    List<DeptUserView> selectDeptUserList(@Param("deptType") String deptType, @Param("deptName") String deptName);
+    List<DeptUserView> selectDeptUserList(@Param("deptType") Long deptType, @Param("deptName") String deptName);
 }
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/dept/dao/mapping/BusDeptUserMapper.xml b/casic-sluicewell/src/main/java/com/casic/missiles/modular/dept/dao/mapping/BusDeptUserMapper.xml
index 9cde3cc..37adcf8 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/dept/dao/mapping/BusDeptUserMapper.xml
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/dept/dao/mapping/BusDeptUserMapper.xml
@@ -34,7 +34,7 @@
                  AND (fullname LIKE CONCAT('%',#{deptName},'%')
                  OR simplename LIKE CONCAT('%',#{deptName},'%'))
              </if>
-             <if test="deptType != null and deptType != ''">
+             <if test="deptType != null and deptType != -1 ">
                  AND deptType = #{deptType}
              </if>
          </where>
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/dept/service/impl/BusDeptUserServiceImpl.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/dept/service/impl/BusDeptUserServiceImpl.java
index 22c5b6a..3682642 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/dept/service/impl/BusDeptUserServiceImpl.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/dept/service/impl/BusDeptUserServiceImpl.java
@@ -1,12 +1,14 @@
 package com.casic.missiles.modular.dept.service.impl;
 
 
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.modular.dept.dao.BusDeptUserMapper;
 import com.casic.missiles.modular.dept.dto.DeptUserView;
 import com.casic.missiles.modular.dept.model.BusDeptUser;
 import com.casic.missiles.modular.dept.service.IBusDeptUserService;
+import com.mchange.v2.lang.StringUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -28,7 +30,7 @@
 
     @Override
     public List<DeptUserView> selectDeptUserList(String deptType, String deptName) {
-        List<DeptUserView> deptUserViews = this.baseMapper.selectDeptUserList(deptType, deptName);
+        List<DeptUserView> deptUserViews = this.baseMapper.selectDeptUserList(Long.valueOf( StrUtil.isEmpty(deptType)?"-1":deptType), deptName);
         for (DeptUserView deptUserView : deptUserViews) {
             deptUserView.setpName(permissionService.getDeptService().getDeptName(deptUserView.getPid()));
         }
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java
index 89f9586..3746665 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/BusWellInfoMapper.java
@@ -19,7 +19,7 @@
  */
 public interface BusWellInfoMapper extends BaseMapper<BusWellInfo> {
 
-    List<BusWellInfo> selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page<BusWellInfo> page, @Param("keywords") String keywords, @Param("wellType") String wellType, @Param("deptid") String deptid, @Param("bfzt") String bfzt);
+    List<BusWellInfo> selectDataScopePage(@Param("scope") DataScope dataScope, @Param("page") Page<BusWellInfo> page, @Param("keywords") String keywords, @Param("wellType") String wellType, @Param("deptid") Long  deptid, @Param("bfzt") String bfzt);
 
 
 
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml
index bed957f..924d2fa 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/dao/mapping/BusWellInfoMapper.xml
@@ -72,7 +72,7 @@
         <if test="wellType != null and wellType !=''">
             and w.well_Type = #{wellType}
         </if>
-        <if test="deptid != null and deptid !=''">
+        <if test="deptid != null and deptid !=-1 ">
             and w.deptid = #{deptid}
         </if>
         <if test="bfzt != null and bfzt != '' ">
diff --git a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java
index da22fe2..b8bdbc5 100644
--- a/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java
+++ b/casic-sluicewell/src/main/java/com/casic/missiles/modular/system/service/impl/BusWellInfoServiceImpl.java
@@ -70,20 +70,21 @@
     @Override
     @Transactional
     public List<BusWellInfo> selectDataScopePage(DataScope dataScope, Page<BusWellInfo> page, String keywords, String wellType, String deptid, String bfzt) {
-        List<BusWellInfo> list = this.baseMapper.selectDataScopePage(dataScope, page, keywords, wellType, deptid, bfzt);
+        List<BusWellInfo> list = this.baseMapper.selectDataScopePage(dataScope, page, keywords, wellType,
+                Long.valueOf(StrUtil.isEmpty(deptid) ? "-1" : deptid), bfzt);
         list.forEach(well -> {
             well.setWellTypeName(dictService.getDictNameByCode(BusWellConst.SLUICEWELL_TYPE, well.getWellType()));
             well.setDeptName(service.getDeptService().getDeptName(well.getDeptid()));
             well.setBfztName(dictService.getDictNameByCode(BusWellConst.BFZT_TEMP, well.getBfzt()));
-            well.setQu(StringUtils.isEmpty(well.getArea())?"":this.getAreaPid(Long.valueOf(well.getArea())));
+            well.setQu(StringUtils.isEmpty(well.getArea()) ? "" : this.getAreaPid(Long.valueOf(well.getArea())));
             well.setResponsibleDeptName(service.getDeptService().getDeptName(Long.valueOf(well.getResponsibleDept())));
         });
         return list;
     }
 
     @Override
-    public Integer armingById(Long id,String bfzt) {
-        return  this.baseMapper.armingById(id,bfzt);
+    public Integer armingById(Long id, String bfzt) {
+        return this.baseMapper.armingById(id, bfzt);
     }
 
     @Override