diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
index 5e10696..008d58b 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
@@ -5,7 +5,6 @@
 import com.alibaba.fastjson.JSON;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
@@ -15,7 +14,6 @@
 import com.casic.missiles.modular.system.model.DeptPermission;
 import com.casic.missiles.modular.system.service.IDeptPermissionService;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.ibatis.jdbc.Null;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.util.ObjectUtils;
@@ -52,6 +50,9 @@
     @RequestMapping("/level/list")
     @ResponseBody
     public Object levelList(Long tenantId) {
+        if(ObjectUtils.isEmpty(tenantId)){
+            return ResponseData.error("项目id未传参数");
+        }
         List<Map<String, Object>> levelList = new ArrayList<>();
         AuthUser currUser = permissionService.getAuthService().getLoginUser();
         //当前用户所属组织机构关联的项目id

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
index 5e10696..008d58b 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
@@ -5,7 +5,6 @@
 import com.alibaba.fastjson.JSON;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
@@ -15,7 +14,6 @@
 import com.casic.missiles.modular.system.model.DeptPermission;
 import com.casic.missiles.modular.system.service.IDeptPermissionService;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.ibatis.jdbc.Null;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.util.ObjectUtils;
@@ -52,6 +50,9 @@
     @RequestMapping("/level/list")
     @ResponseBody
     public Object levelList(Long tenantId) {
+        if(ObjectUtils.isEmpty(tenantId)){
+            return ResponseData.error("项目id未传参数");
+        }
         List<Map<String, Object>> levelList = new ArrayList<>();
         AuthUser currUser = permissionService.getAuthService().getLoginUser();
         //当前用户所属组织机构关联的项目id
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 5ca3c4a..8ef9cec 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
@@ -37,7 +37,7 @@
 
     String getAlarmContentName(@Param("id") int id);
 
-    int getAlarmContentByName(@Param("sName") String sName);
+    Integer getAlarmContentByName(@Param("sName") String sName);
 
     String getAlarmContentNameById(@Param("alarmContent") int alarmContent);
 

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
index 5e10696..008d58b 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmLevelController.java
@@ -5,7 +5,6 @@
 import com.alibaba.fastjson.JSON;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
 import com.casic.missiles.core.base.controller.BaseController;
-import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.model.auth.AuthUser;
 import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.model.response.ResponseData;
@@ -15,7 +14,6 @@
 import com.casic.missiles.modular.system.model.DeptPermission;
 import com.casic.missiles.modular.system.service.IDeptPermissionService;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.ibatis.jdbc.Null;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.util.ObjectUtils;
@@ -52,6 +50,9 @@
     @RequestMapping("/level/list")
     @ResponseBody
     public Object levelList(Long tenantId) {
+        if(ObjectUtils.isEmpty(tenantId)){
+            return ResponseData.error("项目id未传参数");
+        }
         List<Map<String, Object>> levelList = new ArrayList<>();
         AuthUser currUser = permissionService.getAuthService().getLoginUser();
         //当前用户所属组织机构关联的项目id
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 5ca3c4a..8ef9cec 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
@@ -37,7 +37,7 @@
 
     String getAlarmContentName(@Param("id") int id);
 
-    int getAlarmContentByName(@Param("sName") String sName);
+    Integer getAlarmContentByName(@Param("sName") String sName);
 
     String getAlarmContentNameById(@Param("alarmContent") int alarmContent);
 
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 8549dac..6164bf8 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
@@ -133,7 +133,7 @@
         from dual
     </select>
 
-    <select id="getAlarmContentByName" resultType="int">
+    <select id="getAlarmContentByName" resultType="java.lang.Integer">
         select id as "alarmContent"
         from base_alarm_content_type
         where alarm_content = #{sName}