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 dcb9477..5e10696 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
@@ -89,7 +89,7 @@
      */
     @RequestMapping("/levelByType")
     @ResponseBody
-    public Object levelByType(Long tenantId, String name) {
+    public Object levelByType(Long tenantId, String name,String deviceType) {
         AuthUser currUser = permissionService.getAuthService().getLoginUser();
         if (ObjectUtil.isEmpty(tenantId)) {
             if (StrUtil.isEmpty(currUser.getTenantId())) {
@@ -98,7 +98,7 @@
             //当前用户所属组织机构关联的项目id
             tenantId = Long.valueOf(currUser.getTenantId());
         }
-        List<AlarmLevel> levelList = alarmLevelService.selectByNameAndTenList(tenantId, name);
+        List<AlarmLevel> levelList = alarmLevelService.selectByNameAndTenList(tenantId, name,deviceType);
         System.out.println(levelList.toString());
         return ResponseData.success(levelList);
     }
@@ -115,7 +115,7 @@
                 return ResponseData.error("无关联的项目id");
             }
             Long tenantId = ObjectUtil.isEmpty(alarmLevel.getTenantId()) ? Long.valueOf(userTenantId) : alarmLevel.getTenantId();
-            AlarmLevel oldAlarmLevel = alarmLevelService.selectByNameAndTenAndLevel(tenantId, alarmLevel.getName(), alarmLevel.getLevel());
+            AlarmLevel oldAlarmLevel = alarmLevelService.selectByNameAndTenAndLevel(tenantId, alarmLevel.getDeviceType(), alarmLevel.getName(),alarmLevel.getLevel());
             if (ObjectUtil.isEmpty(oldAlarmLevel)) {
                 //insert
                 alarmLevel.setTenantId(tenantId);

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 dcb9477..5e10696 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
@@ -89,7 +89,7 @@
      */
     @RequestMapping("/levelByType")
     @ResponseBody
-    public Object levelByType(Long tenantId, String name) {
+    public Object levelByType(Long tenantId, String name,String deviceType) {
         AuthUser currUser = permissionService.getAuthService().getLoginUser();
         if (ObjectUtil.isEmpty(tenantId)) {
             if (StrUtil.isEmpty(currUser.getTenantId())) {
@@ -98,7 +98,7 @@
             //当前用户所属组织机构关联的项目id
             tenantId = Long.valueOf(currUser.getTenantId());
         }
-        List<AlarmLevel> levelList = alarmLevelService.selectByNameAndTenList(tenantId, name);
+        List<AlarmLevel> levelList = alarmLevelService.selectByNameAndTenList(tenantId, name,deviceType);
         System.out.println(levelList.toString());
         return ResponseData.success(levelList);
     }
@@ -115,7 +115,7 @@
                 return ResponseData.error("无关联的项目id");
             }
             Long tenantId = ObjectUtil.isEmpty(alarmLevel.getTenantId()) ? Long.valueOf(userTenantId) : alarmLevel.getTenantId();
-            AlarmLevel oldAlarmLevel = alarmLevelService.selectByNameAndTenAndLevel(tenantId, alarmLevel.getName(), alarmLevel.getLevel());
+            AlarmLevel oldAlarmLevel = alarmLevelService.selectByNameAndTenAndLevel(tenantId, alarmLevel.getDeviceType(), alarmLevel.getName(),alarmLevel.getLevel());
             if (ObjectUtil.isEmpty(oldAlarmLevel)) {
                 //insert
                 alarmLevel.setTenantId(tenantId);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java
index 1662422..038c1a8 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java
@@ -22,9 +22,9 @@
 
     List<Map<String, Object>> getLevelList(Long tenantId,Long  deviceType);
 
-    List<AlarmLevel> selectByNameAndTenList(Long tenantId, String name);
+    List<AlarmLevel> selectByNameAndTenList(Long tenantId, String name,String deviceType);
 
-    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name, Integer level);
+    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, Long deviceType,String name, Integer level);
 
     AlarmLevel selectByID(Long 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 dcb9477..5e10696 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
@@ -89,7 +89,7 @@
      */
     @RequestMapping("/levelByType")
     @ResponseBody
-    public Object levelByType(Long tenantId, String name) {
+    public Object levelByType(Long tenantId, String name,String deviceType) {
         AuthUser currUser = permissionService.getAuthService().getLoginUser();
         if (ObjectUtil.isEmpty(tenantId)) {
             if (StrUtil.isEmpty(currUser.getTenantId())) {
@@ -98,7 +98,7 @@
             //当前用户所属组织机构关联的项目id
             tenantId = Long.valueOf(currUser.getTenantId());
         }
-        List<AlarmLevel> levelList = alarmLevelService.selectByNameAndTenList(tenantId, name);
+        List<AlarmLevel> levelList = alarmLevelService.selectByNameAndTenList(tenantId, name,deviceType);
         System.out.println(levelList.toString());
         return ResponseData.success(levelList);
     }
@@ -115,7 +115,7 @@
                 return ResponseData.error("无关联的项目id");
             }
             Long tenantId = ObjectUtil.isEmpty(alarmLevel.getTenantId()) ? Long.valueOf(userTenantId) : alarmLevel.getTenantId();
-            AlarmLevel oldAlarmLevel = alarmLevelService.selectByNameAndTenAndLevel(tenantId, alarmLevel.getName(), alarmLevel.getLevel());
+            AlarmLevel oldAlarmLevel = alarmLevelService.selectByNameAndTenAndLevel(tenantId, alarmLevel.getDeviceType(), alarmLevel.getName(),alarmLevel.getLevel());
             if (ObjectUtil.isEmpty(oldAlarmLevel)) {
                 //insert
                 alarmLevel.setTenantId(tenantId);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java
index 1662422..038c1a8 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java
@@ -22,9 +22,9 @@
 
     List<Map<String, Object>> getLevelList(Long tenantId,Long  deviceType);
 
-    List<AlarmLevel> selectByNameAndTenList(Long tenantId, String name);
+    List<AlarmLevel> selectByNameAndTenList(Long tenantId, String name,String deviceType);
 
-    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name, Integer level);
+    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, Long deviceType,String name, Integer level);
 
     AlarmLevel selectByID(Long id);
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java
index 542fff2..fab6dc2 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java
@@ -6,6 +6,7 @@
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
@@ -16,6 +17,7 @@
 import com.casic.missiles.modular.system.model.AlarmLevel;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.sun.javafx.collections.MappingChange;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
@@ -45,13 +47,13 @@
     }
 
     @Override
-    public List<AlarmLevel> selectByNameAndTenList(Long tenantId, String name) {
-        return this.baseMapper.selectByNameAndTenList(tenantId, name);
+    public List<AlarmLevel> selectByNameAndTenList(Long tenantId, String name, String deviceType) {
+        return this.baseMapper.selectByNameAndTenList(tenantId, name, StringUtils.isEmpty(deviceType) ? -1L : Long.valueOf(deviceType));
     }
 
     @Override
-    public AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name, Integer level) {
-        return this.baseMapper.selectByNameAndTenAndLevel(tenantId, name, level);
+    public AlarmLevel selectByNameAndTenAndLevel(Long tenantId, Long deviceType, String name, Integer level) {
+        return this.baseMapper.selectByNameAndTenAndLevel(tenantId, ObjectUtils.isEmpty(deviceType) ? -1L :deviceType, name, level);
     }
 
 

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 dcb9477..5e10696 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
@@ -89,7 +89,7 @@
      */
     @RequestMapping("/levelByType")
     @ResponseBody
-    public Object levelByType(Long tenantId, String name) {
+    public Object levelByType(Long tenantId, String name,String deviceType) {
         AuthUser currUser = permissionService.getAuthService().getLoginUser();
         if (ObjectUtil.isEmpty(tenantId)) {
             if (StrUtil.isEmpty(currUser.getTenantId())) {
@@ -98,7 +98,7 @@
             //当前用户所属组织机构关联的项目id
             tenantId = Long.valueOf(currUser.getTenantId());
         }
-        List<AlarmLevel> levelList = alarmLevelService.selectByNameAndTenList(tenantId, name);
+        List<AlarmLevel> levelList = alarmLevelService.selectByNameAndTenList(tenantId, name,deviceType);
         System.out.println(levelList.toString());
         return ResponseData.success(levelList);
     }
@@ -115,7 +115,7 @@
                 return ResponseData.error("无关联的项目id");
             }
             Long tenantId = ObjectUtil.isEmpty(alarmLevel.getTenantId()) ? Long.valueOf(userTenantId) : alarmLevel.getTenantId();
-            AlarmLevel oldAlarmLevel = alarmLevelService.selectByNameAndTenAndLevel(tenantId, alarmLevel.getName(), alarmLevel.getLevel());
+            AlarmLevel oldAlarmLevel = alarmLevelService.selectByNameAndTenAndLevel(tenantId, alarmLevel.getDeviceType(), alarmLevel.getName(),alarmLevel.getLevel());
             if (ObjectUtil.isEmpty(oldAlarmLevel)) {
                 //insert
                 alarmLevel.setTenantId(tenantId);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java
index 1662422..038c1a8 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java
@@ -22,9 +22,9 @@
 
     List<Map<String, Object>> getLevelList(Long tenantId,Long  deviceType);
 
-    List<AlarmLevel> selectByNameAndTenList(Long tenantId, String name);
+    List<AlarmLevel> selectByNameAndTenList(Long tenantId, String name,String deviceType);
 
-    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name, Integer level);
+    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, Long deviceType,String name, Integer level);
 
     AlarmLevel selectByID(Long id);
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java
index 542fff2..fab6dc2 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java
@@ -6,6 +6,7 @@
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
@@ -16,6 +17,7 @@
 import com.casic.missiles.modular.system.model.AlarmLevel;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.sun.javafx.collections.MappingChange;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
@@ -45,13 +47,13 @@
     }
 
     @Override
-    public List<AlarmLevel> selectByNameAndTenList(Long tenantId, String name) {
-        return this.baseMapper.selectByNameAndTenList(tenantId, name);
+    public List<AlarmLevel> selectByNameAndTenList(Long tenantId, String name, String deviceType) {
+        return this.baseMapper.selectByNameAndTenList(tenantId, name, StringUtils.isEmpty(deviceType) ? -1L : Long.valueOf(deviceType));
     }
 
     @Override
-    public AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name, Integer level) {
-        return this.baseMapper.selectByNameAndTenAndLevel(tenantId, name, level);
+    public AlarmLevel selectByNameAndTenAndLevel(Long tenantId, Long deviceType, String name, Integer level) {
+        return this.baseMapper.selectByNameAndTenAndLevel(tenantId, ObjectUtils.isEmpty(deviceType) ? -1L :deviceType, name, level);
     }
 
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
index c54211e..3583918 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
@@ -10,18 +10,22 @@
 
 /**
  * <p>
- *  Mapper 接口
+ * Mapper 接口
  * </p>
  *
  * @author 123
  * @since 2019-10-15
  */
 public interface AlarmLevelMapper extends BaseMapper<AlarmLevel> {
-    List<Map<String, Object>> getLevelList(@Param("tenantId")Long tenantId, @Param("deviceType")Long deviceType);
-    List<AlarmLevel> selectByNameAndTenList(@Param("tenantId")Long tenantId, @Param("name")String name);
-    AlarmLevel selectByNameAndTenAndLevel(@Param("tenantId")Long tenantId, @Param("name")String name, @Param("level") Integer level);
-    AlarmLevel selectByID(@Param("id")Long Id);
-    int deleteByCondition(@Param("deviceType")Long deviceType,
-                          @Param("name")String name,
-                          @Param("tenantId")Long tenantId);
+    List<Map<String, Object>> getLevelList(@Param("tenantId") Long tenantId, @Param("deviceType") Long deviceType);
+
+    List<AlarmLevel> selectByNameAndTenList(@Param("tenantId") Long tenantId, @Param("name") String name, @Param("deviceType") Long deviceType);
+
+    AlarmLevel selectByNameAndTenAndLevel(@Param("tenantId") Long tenantId, @Param("deviceType") Long deviceType,@Param("name") String name, @Param("level") Integer level);
+
+    AlarmLevel selectByID(@Param("id") Long Id);
+
+    int deleteByCondition(@Param("deviceType") Long deviceType,
+                          @Param("name") String name,
+                          @Param("tenantId") Long tenantId);
 }

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 dcb9477..5e10696 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
@@ -89,7 +89,7 @@
      */
     @RequestMapping("/levelByType")
     @ResponseBody
-    public Object levelByType(Long tenantId, String name) {
+    public Object levelByType(Long tenantId, String name,String deviceType) {
         AuthUser currUser = permissionService.getAuthService().getLoginUser();
         if (ObjectUtil.isEmpty(tenantId)) {
             if (StrUtil.isEmpty(currUser.getTenantId())) {
@@ -98,7 +98,7 @@
             //当前用户所属组织机构关联的项目id
             tenantId = Long.valueOf(currUser.getTenantId());
         }
-        List<AlarmLevel> levelList = alarmLevelService.selectByNameAndTenList(tenantId, name);
+        List<AlarmLevel> levelList = alarmLevelService.selectByNameAndTenList(tenantId, name,deviceType);
         System.out.println(levelList.toString());
         return ResponseData.success(levelList);
     }
@@ -115,7 +115,7 @@
                 return ResponseData.error("无关联的项目id");
             }
             Long tenantId = ObjectUtil.isEmpty(alarmLevel.getTenantId()) ? Long.valueOf(userTenantId) : alarmLevel.getTenantId();
-            AlarmLevel oldAlarmLevel = alarmLevelService.selectByNameAndTenAndLevel(tenantId, alarmLevel.getName(), alarmLevel.getLevel());
+            AlarmLevel oldAlarmLevel = alarmLevelService.selectByNameAndTenAndLevel(tenantId, alarmLevel.getDeviceType(), alarmLevel.getName(),alarmLevel.getLevel());
             if (ObjectUtil.isEmpty(oldAlarmLevel)) {
                 //insert
                 alarmLevel.setTenantId(tenantId);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java
index 1662422..038c1a8 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java
@@ -22,9 +22,9 @@
 
     List<Map<String, Object>> getLevelList(Long tenantId,Long  deviceType);
 
-    List<AlarmLevel> selectByNameAndTenList(Long tenantId, String name);
+    List<AlarmLevel> selectByNameAndTenList(Long tenantId, String name,String deviceType);
 
-    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name, Integer level);
+    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, Long deviceType,String name, Integer level);
 
     AlarmLevel selectByID(Long id);
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java
index 542fff2..fab6dc2 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java
@@ -6,6 +6,7 @@
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
@@ -16,6 +17,7 @@
 import com.casic.missiles.modular.system.model.AlarmLevel;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.sun.javafx.collections.MappingChange;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
@@ -45,13 +47,13 @@
     }
 
     @Override
-    public List<AlarmLevel> selectByNameAndTenList(Long tenantId, String name) {
-        return this.baseMapper.selectByNameAndTenList(tenantId, name);
+    public List<AlarmLevel> selectByNameAndTenList(Long tenantId, String name, String deviceType) {
+        return this.baseMapper.selectByNameAndTenList(tenantId, name, StringUtils.isEmpty(deviceType) ? -1L : Long.valueOf(deviceType));
     }
 
     @Override
-    public AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name, Integer level) {
-        return this.baseMapper.selectByNameAndTenAndLevel(tenantId, name, level);
+    public AlarmLevel selectByNameAndTenAndLevel(Long tenantId, Long deviceType, String name, Integer level) {
+        return this.baseMapper.selectByNameAndTenAndLevel(tenantId, ObjectUtils.isEmpty(deviceType) ? -1L :deviceType, name, level);
     }
 
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
index c54211e..3583918 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
@@ -10,18 +10,22 @@
 
 /**
  * <p>
- *  Mapper 接口
+ * Mapper 接口
  * </p>
  *
  * @author 123
  * @since 2019-10-15
  */
 public interface AlarmLevelMapper extends BaseMapper<AlarmLevel> {
-    List<Map<String, Object>> getLevelList(@Param("tenantId")Long tenantId, @Param("deviceType")Long deviceType);
-    List<AlarmLevel> selectByNameAndTenList(@Param("tenantId")Long tenantId, @Param("name")String name);
-    AlarmLevel selectByNameAndTenAndLevel(@Param("tenantId")Long tenantId, @Param("name")String name, @Param("level") Integer level);
-    AlarmLevel selectByID(@Param("id")Long Id);
-    int deleteByCondition(@Param("deviceType")Long deviceType,
-                          @Param("name")String name,
-                          @Param("tenantId")Long tenantId);
+    List<Map<String, Object>> getLevelList(@Param("tenantId") Long tenantId, @Param("deviceType") Long deviceType);
+
+    List<AlarmLevel> selectByNameAndTenList(@Param("tenantId") Long tenantId, @Param("name") String name, @Param("deviceType") Long deviceType);
+
+    AlarmLevel selectByNameAndTenAndLevel(@Param("tenantId") Long tenantId, @Param("deviceType") Long deviceType,@Param("name") String name, @Param("level") Integer level);
+
+    AlarmLevel selectByID(@Param("id") Long Id);
+
+    int deleteByCondition(@Param("deviceType") Long deviceType,
+                          @Param("name") String name,
+                          @Param("tenantId") Long tenantId);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
index d9bb2f4..5961ae4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
@@ -42,6 +42,9 @@
         <include refid="Base_Column_List"/>
         FROM alarm_level
         WHERE TENANT_ID = #{tenantId} AND NAME = #{name}
+        <if test="deviceType!=-1">
+            AND   DEVICE_TYPE = #{deviceType}
+        </if>
     </select>
 
     <select id="selectByNameAndTenAndLevel" resultType="com.casic.missiles.modular.system.model.AlarmLevel">
@@ -49,6 +52,9 @@
         <include refid="Base_Column_List"/>
         FROM alarm_level
         WHERE TENANT_ID = #{tenantId} AND NAME = #{name} AND LEVEL = #{level}
+        <if test="deviceType!=-1">
+            AND   DEVICE_TYPE = #{deviceType}
+        </if>
     </select>
 
     <select id="selectByID" resultType="com.casic.missiles.modular.system.model.AlarmLevel">

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 dcb9477..5e10696 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
@@ -89,7 +89,7 @@
      */
     @RequestMapping("/levelByType")
     @ResponseBody
-    public Object levelByType(Long tenantId, String name) {
+    public Object levelByType(Long tenantId, String name,String deviceType) {
         AuthUser currUser = permissionService.getAuthService().getLoginUser();
         if (ObjectUtil.isEmpty(tenantId)) {
             if (StrUtil.isEmpty(currUser.getTenantId())) {
@@ -98,7 +98,7 @@
             //当前用户所属组织机构关联的项目id
             tenantId = Long.valueOf(currUser.getTenantId());
         }
-        List<AlarmLevel> levelList = alarmLevelService.selectByNameAndTenList(tenantId, name);
+        List<AlarmLevel> levelList = alarmLevelService.selectByNameAndTenList(tenantId, name,deviceType);
         System.out.println(levelList.toString());
         return ResponseData.success(levelList);
     }
@@ -115,7 +115,7 @@
                 return ResponseData.error("无关联的项目id");
             }
             Long tenantId = ObjectUtil.isEmpty(alarmLevel.getTenantId()) ? Long.valueOf(userTenantId) : alarmLevel.getTenantId();
-            AlarmLevel oldAlarmLevel = alarmLevelService.selectByNameAndTenAndLevel(tenantId, alarmLevel.getName(), alarmLevel.getLevel());
+            AlarmLevel oldAlarmLevel = alarmLevelService.selectByNameAndTenAndLevel(tenantId, alarmLevel.getDeviceType(), alarmLevel.getName(),alarmLevel.getLevel());
             if (ObjectUtil.isEmpty(oldAlarmLevel)) {
                 //insert
                 alarmLevel.setTenantId(tenantId);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java
index 1662422..038c1a8 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java
@@ -22,9 +22,9 @@
 
     List<Map<String, Object>> getLevelList(Long tenantId,Long  deviceType);
 
-    List<AlarmLevel> selectByNameAndTenList(Long tenantId, String name);
+    List<AlarmLevel> selectByNameAndTenList(Long tenantId, String name,String deviceType);
 
-    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name, Integer level);
+    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, Long deviceType,String name, Integer level);
 
     AlarmLevel selectByID(Long id);
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java
index 542fff2..fab6dc2 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java
@@ -6,6 +6,7 @@
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
@@ -16,6 +17,7 @@
 import com.casic.missiles.modular.system.model.AlarmLevel;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.sun.javafx.collections.MappingChange;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
@@ -45,13 +47,13 @@
     }
 
     @Override
-    public List<AlarmLevel> selectByNameAndTenList(Long tenantId, String name) {
-        return this.baseMapper.selectByNameAndTenList(tenantId, name);
+    public List<AlarmLevel> selectByNameAndTenList(Long tenantId, String name, String deviceType) {
+        return this.baseMapper.selectByNameAndTenList(tenantId, name, StringUtils.isEmpty(deviceType) ? -1L : Long.valueOf(deviceType));
     }
 
     @Override
-    public AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name, Integer level) {
-        return this.baseMapper.selectByNameAndTenAndLevel(tenantId, name, level);
+    public AlarmLevel selectByNameAndTenAndLevel(Long tenantId, Long deviceType, String name, Integer level) {
+        return this.baseMapper.selectByNameAndTenAndLevel(tenantId, ObjectUtils.isEmpty(deviceType) ? -1L :deviceType, name, level);
     }
 
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
index c54211e..3583918 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
@@ -10,18 +10,22 @@
 
 /**
  * <p>
- *  Mapper 接口
+ * Mapper 接口
  * </p>
  *
  * @author 123
  * @since 2019-10-15
  */
 public interface AlarmLevelMapper extends BaseMapper<AlarmLevel> {
-    List<Map<String, Object>> getLevelList(@Param("tenantId")Long tenantId, @Param("deviceType")Long deviceType);
-    List<AlarmLevel> selectByNameAndTenList(@Param("tenantId")Long tenantId, @Param("name")String name);
-    AlarmLevel selectByNameAndTenAndLevel(@Param("tenantId")Long tenantId, @Param("name")String name, @Param("level") Integer level);
-    AlarmLevel selectByID(@Param("id")Long Id);
-    int deleteByCondition(@Param("deviceType")Long deviceType,
-                          @Param("name")String name,
-                          @Param("tenantId")Long tenantId);
+    List<Map<String, Object>> getLevelList(@Param("tenantId") Long tenantId, @Param("deviceType") Long deviceType);
+
+    List<AlarmLevel> selectByNameAndTenList(@Param("tenantId") Long tenantId, @Param("name") String name, @Param("deviceType") Long deviceType);
+
+    AlarmLevel selectByNameAndTenAndLevel(@Param("tenantId") Long tenantId, @Param("deviceType") Long deviceType,@Param("name") String name, @Param("level") Integer level);
+
+    AlarmLevel selectByID(@Param("id") Long Id);
+
+    int deleteByCondition(@Param("deviceType") Long deviceType,
+                          @Param("name") String name,
+                          @Param("tenantId") Long tenantId);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
index d9bb2f4..5961ae4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
@@ -42,6 +42,9 @@
         <include refid="Base_Column_List"/>
         FROM alarm_level
         WHERE TENANT_ID = #{tenantId} AND NAME = #{name}
+        <if test="deviceType!=-1">
+            AND   DEVICE_TYPE = #{deviceType}
+        </if>
     </select>
 
     <select id="selectByNameAndTenAndLevel" resultType="com.casic.missiles.modular.system.model.AlarmLevel">
@@ -49,6 +52,9 @@
         <include refid="Base_Column_List"/>
         FROM alarm_level
         WHERE TENANT_ID = #{tenantId} AND NAME = #{name} AND LEVEL = #{level}
+        <if test="deviceType!=-1">
+            AND   DEVICE_TYPE = #{deviceType}
+        </if>
     </select>
 
     <select id="selectByID" resultType="com.casic.missiles.modular.system.model.AlarmLevel">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java
index a399ba5..d6a1199 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java
@@ -1,24 +1,22 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.model.response.SuccessResponseData;
 import com.casic.missiles.modular.system.model.DeptPermission;
 import com.casic.missiles.modular.system.service.DeptPermissionConfigService;
+import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
 @RestController
-@RequestMapping("/deptPermission")
+@RequiredArgsConstructor
 public class DeptPermissionController extends BaseController {
 
     private final DeptPermissionConfigService deptPermissionService;
 
-    public DeptPermissionController(DeptPermissionConfigService deptPermissionService) {
-        this.deptPermissionService = deptPermissionService;
-    }
-
     /**
      * 获取分页列表SMI
      */
-    @RequestMapping(value = "/list")
+    @RequestMapping(value = "/deptPermission/list")
     @ResponseBody
     public Object deviceDeptPermissionList(String deptid) {
         return deptPermissionService.deviceDeptPermissionList(deptid);
@@ -27,7 +25,7 @@
     /**
      * 新增SMI
      */
-    @RequestMapping(value = "/add")
+    @RequestMapping(value = "/deptPermission/add")
     @ResponseBody
     public Object addDeptPermission(@RequestBody DeptPermission deviceImei) {
         return deptPermissionService.addDeptPermission(deviceImei);
@@ -36,7 +34,7 @@
     /**
      * 更新SMI
      */
-    @RequestMapping(value = "/update")
+    @RequestMapping(value = "/deptPermission/update")
     @ResponseBody
     public Object editDeptPermission(@RequestBody DeptPermission deviceImei) {
         return deptPermissionService.editDeptPermission(deviceImei);
@@ -45,10 +43,16 @@
     /**
      * 删除imei
      */
-    @RequestMapping(value = "/delete/{id}")
+    @RequestMapping(value = "/deptPermission/delete/{id}")
     @ResponseBody
     public Object deleteDeptPermission(@PathVariable("id") Long id) {
         return deptPermissionService.deleteDeptPermission(id);
     }
 
+    @RequestMapping({"/dept/tree"})
+    @ResponseBody
+    public SuccessResponseData tree(String pid, String deptType,String tips) {
+        return new SuccessResponseData(this.deptPermissionService.treeDataByDept( pid, deptType, tips));
+    }
+
 }

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 dcb9477..5e10696 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
@@ -89,7 +89,7 @@
      */
     @RequestMapping("/levelByType")
     @ResponseBody
-    public Object levelByType(Long tenantId, String name) {
+    public Object levelByType(Long tenantId, String name,String deviceType) {
         AuthUser currUser = permissionService.getAuthService().getLoginUser();
         if (ObjectUtil.isEmpty(tenantId)) {
             if (StrUtil.isEmpty(currUser.getTenantId())) {
@@ -98,7 +98,7 @@
             //当前用户所属组织机构关联的项目id
             tenantId = Long.valueOf(currUser.getTenantId());
         }
-        List<AlarmLevel> levelList = alarmLevelService.selectByNameAndTenList(tenantId, name);
+        List<AlarmLevel> levelList = alarmLevelService.selectByNameAndTenList(tenantId, name,deviceType);
         System.out.println(levelList.toString());
         return ResponseData.success(levelList);
     }
@@ -115,7 +115,7 @@
                 return ResponseData.error("无关联的项目id");
             }
             Long tenantId = ObjectUtil.isEmpty(alarmLevel.getTenantId()) ? Long.valueOf(userTenantId) : alarmLevel.getTenantId();
-            AlarmLevel oldAlarmLevel = alarmLevelService.selectByNameAndTenAndLevel(tenantId, alarmLevel.getName(), alarmLevel.getLevel());
+            AlarmLevel oldAlarmLevel = alarmLevelService.selectByNameAndTenAndLevel(tenantId, alarmLevel.getDeviceType(), alarmLevel.getName(),alarmLevel.getLevel());
             if (ObjectUtil.isEmpty(oldAlarmLevel)) {
                 //insert
                 alarmLevel.setTenantId(tenantId);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java
index 1662422..038c1a8 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java
@@ -22,9 +22,9 @@
 
     List<Map<String, Object>> getLevelList(Long tenantId,Long  deviceType);
 
-    List<AlarmLevel> selectByNameAndTenList(Long tenantId, String name);
+    List<AlarmLevel> selectByNameAndTenList(Long tenantId, String name,String deviceType);
 
-    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name, Integer level);
+    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, Long deviceType,String name, Integer level);
 
     AlarmLevel selectByID(Long id);
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java
index 542fff2..fab6dc2 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java
@@ -6,6 +6,7 @@
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
@@ -16,6 +17,7 @@
 import com.casic.missiles.modular.system.model.AlarmLevel;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.sun.javafx.collections.MappingChange;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
@@ -45,13 +47,13 @@
     }
 
     @Override
-    public List<AlarmLevel> selectByNameAndTenList(Long tenantId, String name) {
-        return this.baseMapper.selectByNameAndTenList(tenantId, name);
+    public List<AlarmLevel> selectByNameAndTenList(Long tenantId, String name, String deviceType) {
+        return this.baseMapper.selectByNameAndTenList(tenantId, name, StringUtils.isEmpty(deviceType) ? -1L : Long.valueOf(deviceType));
     }
 
     @Override
-    public AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name, Integer level) {
-        return this.baseMapper.selectByNameAndTenAndLevel(tenantId, name, level);
+    public AlarmLevel selectByNameAndTenAndLevel(Long tenantId, Long deviceType, String name, Integer level) {
+        return this.baseMapper.selectByNameAndTenAndLevel(tenantId, ObjectUtils.isEmpty(deviceType) ? -1L :deviceType, name, level);
     }
 
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
index c54211e..3583918 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
@@ -10,18 +10,22 @@
 
 /**
  * <p>
- *  Mapper 接口
+ * Mapper 接口
  * </p>
  *
  * @author 123
  * @since 2019-10-15
  */
 public interface AlarmLevelMapper extends BaseMapper<AlarmLevel> {
-    List<Map<String, Object>> getLevelList(@Param("tenantId")Long tenantId, @Param("deviceType")Long deviceType);
-    List<AlarmLevel> selectByNameAndTenList(@Param("tenantId")Long tenantId, @Param("name")String name);
-    AlarmLevel selectByNameAndTenAndLevel(@Param("tenantId")Long tenantId, @Param("name")String name, @Param("level") Integer level);
-    AlarmLevel selectByID(@Param("id")Long Id);
-    int deleteByCondition(@Param("deviceType")Long deviceType,
-                          @Param("name")String name,
-                          @Param("tenantId")Long tenantId);
+    List<Map<String, Object>> getLevelList(@Param("tenantId") Long tenantId, @Param("deviceType") Long deviceType);
+
+    List<AlarmLevel> selectByNameAndTenList(@Param("tenantId") Long tenantId, @Param("name") String name, @Param("deviceType") Long deviceType);
+
+    AlarmLevel selectByNameAndTenAndLevel(@Param("tenantId") Long tenantId, @Param("deviceType") Long deviceType,@Param("name") String name, @Param("level") Integer level);
+
+    AlarmLevel selectByID(@Param("id") Long Id);
+
+    int deleteByCondition(@Param("deviceType") Long deviceType,
+                          @Param("name") String name,
+                          @Param("tenantId") Long tenantId);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
index d9bb2f4..5961ae4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
@@ -42,6 +42,9 @@
         <include refid="Base_Column_List"/>
         FROM alarm_level
         WHERE TENANT_ID = #{tenantId} AND NAME = #{name}
+        <if test="deviceType!=-1">
+            AND   DEVICE_TYPE = #{deviceType}
+        </if>
     </select>
 
     <select id="selectByNameAndTenAndLevel" resultType="com.casic.missiles.modular.system.model.AlarmLevel">
@@ -49,6 +52,9 @@
         <include refid="Base_Column_List"/>
         FROM alarm_level
         WHERE TENANT_ID = #{tenantId} AND NAME = #{name} AND LEVEL = #{level}
+        <if test="deviceType!=-1">
+            AND   DEVICE_TYPE = #{deviceType}
+        </if>
     </select>
 
     <select id="selectByID" resultType="com.casic.missiles.modular.system.model.AlarmLevel">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java
index a399ba5..d6a1199 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java
@@ -1,24 +1,22 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.model.response.SuccessResponseData;
 import com.casic.missiles.modular.system.model.DeptPermission;
 import com.casic.missiles.modular.system.service.DeptPermissionConfigService;
+import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
 @RestController
-@RequestMapping("/deptPermission")
+@RequiredArgsConstructor
 public class DeptPermissionController extends BaseController {
 
     private final DeptPermissionConfigService deptPermissionService;
 
-    public DeptPermissionController(DeptPermissionConfigService deptPermissionService) {
-        this.deptPermissionService = deptPermissionService;
-    }
-
     /**
      * 获取分页列表SMI
      */
-    @RequestMapping(value = "/list")
+    @RequestMapping(value = "/deptPermission/list")
     @ResponseBody
     public Object deviceDeptPermissionList(String deptid) {
         return deptPermissionService.deviceDeptPermissionList(deptid);
@@ -27,7 +25,7 @@
     /**
      * 新增SMI
      */
-    @RequestMapping(value = "/add")
+    @RequestMapping(value = "/deptPermission/add")
     @ResponseBody
     public Object addDeptPermission(@RequestBody DeptPermission deviceImei) {
         return deptPermissionService.addDeptPermission(deviceImei);
@@ -36,7 +34,7 @@
     /**
      * 更新SMI
      */
-    @RequestMapping(value = "/update")
+    @RequestMapping(value = "/deptPermission/update")
     @ResponseBody
     public Object editDeptPermission(@RequestBody DeptPermission deviceImei) {
         return deptPermissionService.editDeptPermission(deviceImei);
@@ -45,10 +43,16 @@
     /**
      * 删除imei
      */
-    @RequestMapping(value = "/delete/{id}")
+    @RequestMapping(value = "/deptPermission/delete/{id}")
     @ResponseBody
     public Object deleteDeptPermission(@PathVariable("id") Long id) {
         return deptPermissionService.deleteDeptPermission(id);
     }
 
+    @RequestMapping({"/dept/tree"})
+    @ResponseBody
+    public SuccessResponseData tree(String pid, String deptType,String tips) {
+        return new SuccessResponseData(this.deptPermissionService.treeDataByDept( pid, deptType, tips));
+    }
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/DeptPermissionConfigDao.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/DeptPermissionConfigDao.java
index 626303f..2c2eb1c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/DeptPermissionConfigDao.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/DeptPermissionConfigDao.java
@@ -1,7 +1,7 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.node.ZTreeNode;
 import com.casic.missiles.modular.system.model.DeptPermission;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -19,4 +19,8 @@
     String getDeviceName(@Param("deviceType") Long deviceType);
 
     String getWellName(@Param("pid") Long pid, @Param("wellType") String wellType);
+
+    List<ZTreeNode> treeDataByDept(@Param("pid") String pid, @Param("id") Long id,
+                                   @Param("deptType") String deptType, @Param("tips") String tips);
+
 }

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 dcb9477..5e10696 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
@@ -89,7 +89,7 @@
      */
     @RequestMapping("/levelByType")
     @ResponseBody
-    public Object levelByType(Long tenantId, String name) {
+    public Object levelByType(Long tenantId, String name,String deviceType) {
         AuthUser currUser = permissionService.getAuthService().getLoginUser();
         if (ObjectUtil.isEmpty(tenantId)) {
             if (StrUtil.isEmpty(currUser.getTenantId())) {
@@ -98,7 +98,7 @@
             //当前用户所属组织机构关联的项目id
             tenantId = Long.valueOf(currUser.getTenantId());
         }
-        List<AlarmLevel> levelList = alarmLevelService.selectByNameAndTenList(tenantId, name);
+        List<AlarmLevel> levelList = alarmLevelService.selectByNameAndTenList(tenantId, name,deviceType);
         System.out.println(levelList.toString());
         return ResponseData.success(levelList);
     }
@@ -115,7 +115,7 @@
                 return ResponseData.error("无关联的项目id");
             }
             Long tenantId = ObjectUtil.isEmpty(alarmLevel.getTenantId()) ? Long.valueOf(userTenantId) : alarmLevel.getTenantId();
-            AlarmLevel oldAlarmLevel = alarmLevelService.selectByNameAndTenAndLevel(tenantId, alarmLevel.getName(), alarmLevel.getLevel());
+            AlarmLevel oldAlarmLevel = alarmLevelService.selectByNameAndTenAndLevel(tenantId, alarmLevel.getDeviceType(), alarmLevel.getName(),alarmLevel.getLevel());
             if (ObjectUtil.isEmpty(oldAlarmLevel)) {
                 //insert
                 alarmLevel.setTenantId(tenantId);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java
index 1662422..038c1a8 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java
@@ -22,9 +22,9 @@
 
     List<Map<String, Object>> getLevelList(Long tenantId,Long  deviceType);
 
-    List<AlarmLevel> selectByNameAndTenList(Long tenantId, String name);
+    List<AlarmLevel> selectByNameAndTenList(Long tenantId, String name,String deviceType);
 
-    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name, Integer level);
+    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, Long deviceType,String name, Integer level);
 
     AlarmLevel selectByID(Long id);
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java
index 542fff2..fab6dc2 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java
@@ -6,6 +6,7 @@
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
@@ -16,6 +17,7 @@
 import com.casic.missiles.modular.system.model.AlarmLevel;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.sun.javafx.collections.MappingChange;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
@@ -45,13 +47,13 @@
     }
 
     @Override
-    public List<AlarmLevel> selectByNameAndTenList(Long tenantId, String name) {
-        return this.baseMapper.selectByNameAndTenList(tenantId, name);
+    public List<AlarmLevel> selectByNameAndTenList(Long tenantId, String name, String deviceType) {
+        return this.baseMapper.selectByNameAndTenList(tenantId, name, StringUtils.isEmpty(deviceType) ? -1L : Long.valueOf(deviceType));
     }
 
     @Override
-    public AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name, Integer level) {
-        return this.baseMapper.selectByNameAndTenAndLevel(tenantId, name, level);
+    public AlarmLevel selectByNameAndTenAndLevel(Long tenantId, Long deviceType, String name, Integer level) {
+        return this.baseMapper.selectByNameAndTenAndLevel(tenantId, ObjectUtils.isEmpty(deviceType) ? -1L :deviceType, name, level);
     }
 
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
index c54211e..3583918 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
@@ -10,18 +10,22 @@
 
 /**
  * <p>
- *  Mapper 接口
+ * Mapper 接口
  * </p>
  *
  * @author 123
  * @since 2019-10-15
  */
 public interface AlarmLevelMapper extends BaseMapper<AlarmLevel> {
-    List<Map<String, Object>> getLevelList(@Param("tenantId")Long tenantId, @Param("deviceType")Long deviceType);
-    List<AlarmLevel> selectByNameAndTenList(@Param("tenantId")Long tenantId, @Param("name")String name);
-    AlarmLevel selectByNameAndTenAndLevel(@Param("tenantId")Long tenantId, @Param("name")String name, @Param("level") Integer level);
-    AlarmLevel selectByID(@Param("id")Long Id);
-    int deleteByCondition(@Param("deviceType")Long deviceType,
-                          @Param("name")String name,
-                          @Param("tenantId")Long tenantId);
+    List<Map<String, Object>> getLevelList(@Param("tenantId") Long tenantId, @Param("deviceType") Long deviceType);
+
+    List<AlarmLevel> selectByNameAndTenList(@Param("tenantId") Long tenantId, @Param("name") String name, @Param("deviceType") Long deviceType);
+
+    AlarmLevel selectByNameAndTenAndLevel(@Param("tenantId") Long tenantId, @Param("deviceType") Long deviceType,@Param("name") String name, @Param("level") Integer level);
+
+    AlarmLevel selectByID(@Param("id") Long Id);
+
+    int deleteByCondition(@Param("deviceType") Long deviceType,
+                          @Param("name") String name,
+                          @Param("tenantId") Long tenantId);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
index d9bb2f4..5961ae4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
@@ -42,6 +42,9 @@
         <include refid="Base_Column_List"/>
         FROM alarm_level
         WHERE TENANT_ID = #{tenantId} AND NAME = #{name}
+        <if test="deviceType!=-1">
+            AND   DEVICE_TYPE = #{deviceType}
+        </if>
     </select>
 
     <select id="selectByNameAndTenAndLevel" resultType="com.casic.missiles.modular.system.model.AlarmLevel">
@@ -49,6 +52,9 @@
         <include refid="Base_Column_List"/>
         FROM alarm_level
         WHERE TENANT_ID = #{tenantId} AND NAME = #{name} AND LEVEL = #{level}
+        <if test="deviceType!=-1">
+            AND   DEVICE_TYPE = #{deviceType}
+        </if>
     </select>
 
     <select id="selectByID" resultType="com.casic.missiles.modular.system.model.AlarmLevel">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java
index a399ba5..d6a1199 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java
@@ -1,24 +1,22 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.model.response.SuccessResponseData;
 import com.casic.missiles.modular.system.model.DeptPermission;
 import com.casic.missiles.modular.system.service.DeptPermissionConfigService;
+import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
 @RestController
-@RequestMapping("/deptPermission")
+@RequiredArgsConstructor
 public class DeptPermissionController extends BaseController {
 
     private final DeptPermissionConfigService deptPermissionService;
 
-    public DeptPermissionController(DeptPermissionConfigService deptPermissionService) {
-        this.deptPermissionService = deptPermissionService;
-    }
-
     /**
      * 获取分页列表SMI
      */
-    @RequestMapping(value = "/list")
+    @RequestMapping(value = "/deptPermission/list")
     @ResponseBody
     public Object deviceDeptPermissionList(String deptid) {
         return deptPermissionService.deviceDeptPermissionList(deptid);
@@ -27,7 +25,7 @@
     /**
      * 新增SMI
      */
-    @RequestMapping(value = "/add")
+    @RequestMapping(value = "/deptPermission/add")
     @ResponseBody
     public Object addDeptPermission(@RequestBody DeptPermission deviceImei) {
         return deptPermissionService.addDeptPermission(deviceImei);
@@ -36,7 +34,7 @@
     /**
      * 更新SMI
      */
-    @RequestMapping(value = "/update")
+    @RequestMapping(value = "/deptPermission/update")
     @ResponseBody
     public Object editDeptPermission(@RequestBody DeptPermission deviceImei) {
         return deptPermissionService.editDeptPermission(deviceImei);
@@ -45,10 +43,16 @@
     /**
      * 删除imei
      */
-    @RequestMapping(value = "/delete/{id}")
+    @RequestMapping(value = "/deptPermission/delete/{id}")
     @ResponseBody
     public Object deleteDeptPermission(@PathVariable("id") Long id) {
         return deptPermissionService.deleteDeptPermission(id);
     }
 
+    @RequestMapping({"/dept/tree"})
+    @ResponseBody
+    public SuccessResponseData tree(String pid, String deptType,String tips) {
+        return new SuccessResponseData(this.deptPermissionService.treeDataByDept( pid, deptType, tips));
+    }
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/DeptPermissionConfigDao.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/DeptPermissionConfigDao.java
index 626303f..2c2eb1c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/DeptPermissionConfigDao.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/DeptPermissionConfigDao.java
@@ -1,7 +1,7 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.node.ZTreeNode;
 import com.casic.missiles.modular.system.model.DeptPermission;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -19,4 +19,8 @@
     String getDeviceName(@Param("deviceType") Long deviceType);
 
     String getWellName(@Param("pid") Long pid, @Param("wellType") String wellType);
+
+    List<ZTreeNode> treeDataByDept(@Param("pid") String pid, @Param("id") Long id,
+                                   @Param("deptType") String deptType, @Param("tips") String tips);
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionConfigMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionConfigMapper.xml
index 606d817..1796715 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionConfigMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionConfigMapper.xml
@@ -9,8 +9,30 @@
         <result column="dept_id" property="deptId"/>
     </resultMap>
 
+    <sql id="deptid_sql" databaseId="mysql">
+        CONCAT
+        ('%[',
+        #{pid,jdbcType=VARCHAR},
+        ']%'
+        )
+    </sql>
+
+    <sql id="deptid_sql" databaseId="pgsql">
+        CONCAT
+        ('%[',
+            #{pid,jdbcType=VARCHAR},
+            ']%'
+        )
+    </sql>
+    <sql id="deptid_sql" databaseId="oracle">
+        '%[' ||
+        #{pid,jdbcType=VARCHAR}
+        ||
+        ']%'
+    </sql>
+
     <!-- 通用查询结果列 -->
-    <select id="getListPage" resultType="MAP">
+    <select id="getListPage" resultType="java.util.Map">
         SELECT id,deptid,communication,well_type AS "wellType",device_type AS "deviceType",area,map,lng,lat
         FROM config_dept_permission
         WHERE 1=1
@@ -19,22 +41,53 @@
         </if>
     </select>
 
-    <select id="getPid" resultType="Long">
+    <select id="getPid" resultType="java.lang.Long">
        SELECT ID
 	   FROM sys_dict
 	   WHERE  code='sluicewellType'
     </select>
 
-    <select id="getDeviceName" resultType="String">
+    <select id="getDeviceName" resultType="java.lang.String">
         SELECT TYPE_NAME
         FROM   base_device_type
         WHERE id=#{deviceType}
     </select>
 
-    <select id="getWellName" resultType="String">
+    <select id="getWellName" resultType="java.lang.String">
        SELECT NAME
 	   FROM sys_dict
 	   WHERE  PID=#{pid}  AND  CODE=#{wellType}
     </select>
 
+
+    <select id="treeDataByDept" resultType="com.casic.missiles.core.node.ZTreeNode">
+        select id,pid as pId,simple_name as name,id as "deptId",
+        (
+        CASE
+        WHEN (pId = '0' OR pId IS NULL) THEN
+        'true'
+        ELSE
+        'false'
+        END
+        ) as isOpen from sys_dept
+        <where>
+            and del_flag = '0'
+            <if test='pid != null and pid != -1'>
+                and ( pids like
+                <include refid="deptid_sql"/>
+                )
+            </if>
+            <if test='id != null and id !=-1'>
+                or id=#{id}
+            </if>
+            <if test='deptType != null and deptType != ""'>
+                and dept_type = #{deptType}
+            </if>
+            <if test="tips != null and tips != ''">
+                and tips = #{tips}
+            </if>
+        </where>
+        ORDER BY pid,num
+    </select>
+
 </mapper>

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 dcb9477..5e10696 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
@@ -89,7 +89,7 @@
      */
     @RequestMapping("/levelByType")
     @ResponseBody
-    public Object levelByType(Long tenantId, String name) {
+    public Object levelByType(Long tenantId, String name,String deviceType) {
         AuthUser currUser = permissionService.getAuthService().getLoginUser();
         if (ObjectUtil.isEmpty(tenantId)) {
             if (StrUtil.isEmpty(currUser.getTenantId())) {
@@ -98,7 +98,7 @@
             //当前用户所属组织机构关联的项目id
             tenantId = Long.valueOf(currUser.getTenantId());
         }
-        List<AlarmLevel> levelList = alarmLevelService.selectByNameAndTenList(tenantId, name);
+        List<AlarmLevel> levelList = alarmLevelService.selectByNameAndTenList(tenantId, name,deviceType);
         System.out.println(levelList.toString());
         return ResponseData.success(levelList);
     }
@@ -115,7 +115,7 @@
                 return ResponseData.error("无关联的项目id");
             }
             Long tenantId = ObjectUtil.isEmpty(alarmLevel.getTenantId()) ? Long.valueOf(userTenantId) : alarmLevel.getTenantId();
-            AlarmLevel oldAlarmLevel = alarmLevelService.selectByNameAndTenAndLevel(tenantId, alarmLevel.getName(), alarmLevel.getLevel());
+            AlarmLevel oldAlarmLevel = alarmLevelService.selectByNameAndTenAndLevel(tenantId, alarmLevel.getDeviceType(), alarmLevel.getName(),alarmLevel.getLevel());
             if (ObjectUtil.isEmpty(oldAlarmLevel)) {
                 //insert
                 alarmLevel.setTenantId(tenantId);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java
index 1662422..038c1a8 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java
@@ -22,9 +22,9 @@
 
     List<Map<String, Object>> getLevelList(Long tenantId,Long  deviceType);
 
-    List<AlarmLevel> selectByNameAndTenList(Long tenantId, String name);
+    List<AlarmLevel> selectByNameAndTenList(Long tenantId, String name,String deviceType);
 
-    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name, Integer level);
+    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, Long deviceType,String name, Integer level);
 
     AlarmLevel selectByID(Long id);
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java
index 542fff2..fab6dc2 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java
@@ -6,6 +6,7 @@
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
@@ -16,6 +17,7 @@
 import com.casic.missiles.modular.system.model.AlarmLevel;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.sun.javafx.collections.MappingChange;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
@@ -45,13 +47,13 @@
     }
 
     @Override
-    public List<AlarmLevel> selectByNameAndTenList(Long tenantId, String name) {
-        return this.baseMapper.selectByNameAndTenList(tenantId, name);
+    public List<AlarmLevel> selectByNameAndTenList(Long tenantId, String name, String deviceType) {
+        return this.baseMapper.selectByNameAndTenList(tenantId, name, StringUtils.isEmpty(deviceType) ? -1L : Long.valueOf(deviceType));
     }
 
     @Override
-    public AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name, Integer level) {
-        return this.baseMapper.selectByNameAndTenAndLevel(tenantId, name, level);
+    public AlarmLevel selectByNameAndTenAndLevel(Long tenantId, Long deviceType, String name, Integer level) {
+        return this.baseMapper.selectByNameAndTenAndLevel(tenantId, ObjectUtils.isEmpty(deviceType) ? -1L :deviceType, name, level);
     }
 
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
index c54211e..3583918 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
@@ -10,18 +10,22 @@
 
 /**
  * <p>
- *  Mapper 接口
+ * Mapper 接口
  * </p>
  *
  * @author 123
  * @since 2019-10-15
  */
 public interface AlarmLevelMapper extends BaseMapper<AlarmLevel> {
-    List<Map<String, Object>> getLevelList(@Param("tenantId")Long tenantId, @Param("deviceType")Long deviceType);
-    List<AlarmLevel> selectByNameAndTenList(@Param("tenantId")Long tenantId, @Param("name")String name);
-    AlarmLevel selectByNameAndTenAndLevel(@Param("tenantId")Long tenantId, @Param("name")String name, @Param("level") Integer level);
-    AlarmLevel selectByID(@Param("id")Long Id);
-    int deleteByCondition(@Param("deviceType")Long deviceType,
-                          @Param("name")String name,
-                          @Param("tenantId")Long tenantId);
+    List<Map<String, Object>> getLevelList(@Param("tenantId") Long tenantId, @Param("deviceType") Long deviceType);
+
+    List<AlarmLevel> selectByNameAndTenList(@Param("tenantId") Long tenantId, @Param("name") String name, @Param("deviceType") Long deviceType);
+
+    AlarmLevel selectByNameAndTenAndLevel(@Param("tenantId") Long tenantId, @Param("deviceType") Long deviceType,@Param("name") String name, @Param("level") Integer level);
+
+    AlarmLevel selectByID(@Param("id") Long Id);
+
+    int deleteByCondition(@Param("deviceType") Long deviceType,
+                          @Param("name") String name,
+                          @Param("tenantId") Long tenantId);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
index d9bb2f4..5961ae4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
@@ -42,6 +42,9 @@
         <include refid="Base_Column_List"/>
         FROM alarm_level
         WHERE TENANT_ID = #{tenantId} AND NAME = #{name}
+        <if test="deviceType!=-1">
+            AND   DEVICE_TYPE = #{deviceType}
+        </if>
     </select>
 
     <select id="selectByNameAndTenAndLevel" resultType="com.casic.missiles.modular.system.model.AlarmLevel">
@@ -49,6 +52,9 @@
         <include refid="Base_Column_List"/>
         FROM alarm_level
         WHERE TENANT_ID = #{tenantId} AND NAME = #{name} AND LEVEL = #{level}
+        <if test="deviceType!=-1">
+            AND   DEVICE_TYPE = #{deviceType}
+        </if>
     </select>
 
     <select id="selectByID" resultType="com.casic.missiles.modular.system.model.AlarmLevel">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java
index a399ba5..d6a1199 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java
@@ -1,24 +1,22 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.model.response.SuccessResponseData;
 import com.casic.missiles.modular.system.model.DeptPermission;
 import com.casic.missiles.modular.system.service.DeptPermissionConfigService;
+import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
 @RestController
-@RequestMapping("/deptPermission")
+@RequiredArgsConstructor
 public class DeptPermissionController extends BaseController {
 
     private final DeptPermissionConfigService deptPermissionService;
 
-    public DeptPermissionController(DeptPermissionConfigService deptPermissionService) {
-        this.deptPermissionService = deptPermissionService;
-    }
-
     /**
      * 获取分页列表SMI
      */
-    @RequestMapping(value = "/list")
+    @RequestMapping(value = "/deptPermission/list")
     @ResponseBody
     public Object deviceDeptPermissionList(String deptid) {
         return deptPermissionService.deviceDeptPermissionList(deptid);
@@ -27,7 +25,7 @@
     /**
      * 新增SMI
      */
-    @RequestMapping(value = "/add")
+    @RequestMapping(value = "/deptPermission/add")
     @ResponseBody
     public Object addDeptPermission(@RequestBody DeptPermission deviceImei) {
         return deptPermissionService.addDeptPermission(deviceImei);
@@ -36,7 +34,7 @@
     /**
      * 更新SMI
      */
-    @RequestMapping(value = "/update")
+    @RequestMapping(value = "/deptPermission/update")
     @ResponseBody
     public Object editDeptPermission(@RequestBody DeptPermission deviceImei) {
         return deptPermissionService.editDeptPermission(deviceImei);
@@ -45,10 +43,16 @@
     /**
      * 删除imei
      */
-    @RequestMapping(value = "/delete/{id}")
+    @RequestMapping(value = "/deptPermission/delete/{id}")
     @ResponseBody
     public Object deleteDeptPermission(@PathVariable("id") Long id) {
         return deptPermissionService.deleteDeptPermission(id);
     }
 
+    @RequestMapping({"/dept/tree"})
+    @ResponseBody
+    public SuccessResponseData tree(String pid, String deptType,String tips) {
+        return new SuccessResponseData(this.deptPermissionService.treeDataByDept( pid, deptType, tips));
+    }
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/DeptPermissionConfigDao.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/DeptPermissionConfigDao.java
index 626303f..2c2eb1c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/DeptPermissionConfigDao.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/DeptPermissionConfigDao.java
@@ -1,7 +1,7 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.node.ZTreeNode;
 import com.casic.missiles.modular.system.model.DeptPermission;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -19,4 +19,8 @@
     String getDeviceName(@Param("deviceType") Long deviceType);
 
     String getWellName(@Param("pid") Long pid, @Param("wellType") String wellType);
+
+    List<ZTreeNode> treeDataByDept(@Param("pid") String pid, @Param("id") Long id,
+                                   @Param("deptType") String deptType, @Param("tips") String tips);
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionConfigMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionConfigMapper.xml
index 606d817..1796715 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionConfigMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionConfigMapper.xml
@@ -9,8 +9,30 @@
         <result column="dept_id" property="deptId"/>
     </resultMap>
 
+    <sql id="deptid_sql" databaseId="mysql">
+        CONCAT
+        ('%[',
+        #{pid,jdbcType=VARCHAR},
+        ']%'
+        )
+    </sql>
+
+    <sql id="deptid_sql" databaseId="pgsql">
+        CONCAT
+        ('%[',
+            #{pid,jdbcType=VARCHAR},
+            ']%'
+        )
+    </sql>
+    <sql id="deptid_sql" databaseId="oracle">
+        '%[' ||
+        #{pid,jdbcType=VARCHAR}
+        ||
+        ']%'
+    </sql>
+
     <!-- 通用查询结果列 -->
-    <select id="getListPage" resultType="MAP">
+    <select id="getListPage" resultType="java.util.Map">
         SELECT id,deptid,communication,well_type AS "wellType",device_type AS "deviceType",area,map,lng,lat
         FROM config_dept_permission
         WHERE 1=1
@@ -19,22 +41,53 @@
         </if>
     </select>
 
-    <select id="getPid" resultType="Long">
+    <select id="getPid" resultType="java.lang.Long">
        SELECT ID
 	   FROM sys_dict
 	   WHERE  code='sluicewellType'
     </select>
 
-    <select id="getDeviceName" resultType="String">
+    <select id="getDeviceName" resultType="java.lang.String">
         SELECT TYPE_NAME
         FROM   base_device_type
         WHERE id=#{deviceType}
     </select>
 
-    <select id="getWellName" resultType="String">
+    <select id="getWellName" resultType="java.lang.String">
        SELECT NAME
 	   FROM sys_dict
 	   WHERE  PID=#{pid}  AND  CODE=#{wellType}
     </select>
 
+
+    <select id="treeDataByDept" resultType="com.casic.missiles.core.node.ZTreeNode">
+        select id,pid as pId,simple_name as name,id as "deptId",
+        (
+        CASE
+        WHEN (pId = '0' OR pId IS NULL) THEN
+        'true'
+        ELSE
+        'false'
+        END
+        ) as isOpen from sys_dept
+        <where>
+            and del_flag = '0'
+            <if test='pid != null and pid != -1'>
+                and ( pids like
+                <include refid="deptid_sql"/>
+                )
+            </if>
+            <if test='id != null and id !=-1'>
+                or id=#{id}
+            </if>
+            <if test='deptType != null and deptType != ""'>
+                and dept_type = #{deptType}
+            </if>
+            <if test="tips != null and tips != ''">
+                and tips = #{tips}
+            </if>
+        </where>
+        ORDER BY pid,num
+    </select>
+
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/DeptPermissionConfigService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/DeptPermissionConfigService.java
index 60515e6..202e395 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/DeptPermissionConfigService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/DeptPermissionConfigService.java
@@ -1,9 +1,12 @@
 package com.casic.missiles.modular.system.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.node.ZTreeNode;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.DeptPermission;
 
+import java.util.List;
+
 public interface DeptPermissionConfigService {
 
     ResponseData deviceDeptPermissionList(String deptid);
@@ -14,4 +17,6 @@
 
     Object deleteDeptPermission(Long id);
 
+    List<ZTreeNode> treeDataByDept(String pid, String deptType, String tips);
+
 }

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 dcb9477..5e10696 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
@@ -89,7 +89,7 @@
      */
     @RequestMapping("/levelByType")
     @ResponseBody
-    public Object levelByType(Long tenantId, String name) {
+    public Object levelByType(Long tenantId, String name,String deviceType) {
         AuthUser currUser = permissionService.getAuthService().getLoginUser();
         if (ObjectUtil.isEmpty(tenantId)) {
             if (StrUtil.isEmpty(currUser.getTenantId())) {
@@ -98,7 +98,7 @@
             //当前用户所属组织机构关联的项目id
             tenantId = Long.valueOf(currUser.getTenantId());
         }
-        List<AlarmLevel> levelList = alarmLevelService.selectByNameAndTenList(tenantId, name);
+        List<AlarmLevel> levelList = alarmLevelService.selectByNameAndTenList(tenantId, name,deviceType);
         System.out.println(levelList.toString());
         return ResponseData.success(levelList);
     }
@@ -115,7 +115,7 @@
                 return ResponseData.error("无关联的项目id");
             }
             Long tenantId = ObjectUtil.isEmpty(alarmLevel.getTenantId()) ? Long.valueOf(userTenantId) : alarmLevel.getTenantId();
-            AlarmLevel oldAlarmLevel = alarmLevelService.selectByNameAndTenAndLevel(tenantId, alarmLevel.getName(), alarmLevel.getLevel());
+            AlarmLevel oldAlarmLevel = alarmLevelService.selectByNameAndTenAndLevel(tenantId, alarmLevel.getDeviceType(), alarmLevel.getName(),alarmLevel.getLevel());
             if (ObjectUtil.isEmpty(oldAlarmLevel)) {
                 //insert
                 alarmLevel.setTenantId(tenantId);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java
index 1662422..038c1a8 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java
@@ -22,9 +22,9 @@
 
     List<Map<String, Object>> getLevelList(Long tenantId,Long  deviceType);
 
-    List<AlarmLevel> selectByNameAndTenList(Long tenantId, String name);
+    List<AlarmLevel> selectByNameAndTenList(Long tenantId, String name,String deviceType);
 
-    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name, Integer level);
+    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, Long deviceType,String name, Integer level);
 
     AlarmLevel selectByID(Long id);
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java
index 542fff2..fab6dc2 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java
@@ -6,6 +6,7 @@
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
@@ -16,6 +17,7 @@
 import com.casic.missiles.modular.system.model.AlarmLevel;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.sun.javafx.collections.MappingChange;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
@@ -45,13 +47,13 @@
     }
 
     @Override
-    public List<AlarmLevel> selectByNameAndTenList(Long tenantId, String name) {
-        return this.baseMapper.selectByNameAndTenList(tenantId, name);
+    public List<AlarmLevel> selectByNameAndTenList(Long tenantId, String name, String deviceType) {
+        return this.baseMapper.selectByNameAndTenList(tenantId, name, StringUtils.isEmpty(deviceType) ? -1L : Long.valueOf(deviceType));
     }
 
     @Override
-    public AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name, Integer level) {
-        return this.baseMapper.selectByNameAndTenAndLevel(tenantId, name, level);
+    public AlarmLevel selectByNameAndTenAndLevel(Long tenantId, Long deviceType, String name, Integer level) {
+        return this.baseMapper.selectByNameAndTenAndLevel(tenantId, ObjectUtils.isEmpty(deviceType) ? -1L :deviceType, name, level);
     }
 
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
index c54211e..3583918 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
@@ -10,18 +10,22 @@
 
 /**
  * <p>
- *  Mapper 接口
+ * Mapper 接口
  * </p>
  *
  * @author 123
  * @since 2019-10-15
  */
 public interface AlarmLevelMapper extends BaseMapper<AlarmLevel> {
-    List<Map<String, Object>> getLevelList(@Param("tenantId")Long tenantId, @Param("deviceType")Long deviceType);
-    List<AlarmLevel> selectByNameAndTenList(@Param("tenantId")Long tenantId, @Param("name")String name);
-    AlarmLevel selectByNameAndTenAndLevel(@Param("tenantId")Long tenantId, @Param("name")String name, @Param("level") Integer level);
-    AlarmLevel selectByID(@Param("id")Long Id);
-    int deleteByCondition(@Param("deviceType")Long deviceType,
-                          @Param("name")String name,
-                          @Param("tenantId")Long tenantId);
+    List<Map<String, Object>> getLevelList(@Param("tenantId") Long tenantId, @Param("deviceType") Long deviceType);
+
+    List<AlarmLevel> selectByNameAndTenList(@Param("tenantId") Long tenantId, @Param("name") String name, @Param("deviceType") Long deviceType);
+
+    AlarmLevel selectByNameAndTenAndLevel(@Param("tenantId") Long tenantId, @Param("deviceType") Long deviceType,@Param("name") String name, @Param("level") Integer level);
+
+    AlarmLevel selectByID(@Param("id") Long Id);
+
+    int deleteByCondition(@Param("deviceType") Long deviceType,
+                          @Param("name") String name,
+                          @Param("tenantId") Long tenantId);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
index d9bb2f4..5961ae4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
@@ -42,6 +42,9 @@
         <include refid="Base_Column_List"/>
         FROM alarm_level
         WHERE TENANT_ID = #{tenantId} AND NAME = #{name}
+        <if test="deviceType!=-1">
+            AND   DEVICE_TYPE = #{deviceType}
+        </if>
     </select>
 
     <select id="selectByNameAndTenAndLevel" resultType="com.casic.missiles.modular.system.model.AlarmLevel">
@@ -49,6 +52,9 @@
         <include refid="Base_Column_List"/>
         FROM alarm_level
         WHERE TENANT_ID = #{tenantId} AND NAME = #{name} AND LEVEL = #{level}
+        <if test="deviceType!=-1">
+            AND   DEVICE_TYPE = #{deviceType}
+        </if>
     </select>
 
     <select id="selectByID" resultType="com.casic.missiles.modular.system.model.AlarmLevel">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java
index a399ba5..d6a1199 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java
@@ -1,24 +1,22 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.model.response.SuccessResponseData;
 import com.casic.missiles.modular.system.model.DeptPermission;
 import com.casic.missiles.modular.system.service.DeptPermissionConfigService;
+import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
 @RestController
-@RequestMapping("/deptPermission")
+@RequiredArgsConstructor
 public class DeptPermissionController extends BaseController {
 
     private final DeptPermissionConfigService deptPermissionService;
 
-    public DeptPermissionController(DeptPermissionConfigService deptPermissionService) {
-        this.deptPermissionService = deptPermissionService;
-    }
-
     /**
      * 获取分页列表SMI
      */
-    @RequestMapping(value = "/list")
+    @RequestMapping(value = "/deptPermission/list")
     @ResponseBody
     public Object deviceDeptPermissionList(String deptid) {
         return deptPermissionService.deviceDeptPermissionList(deptid);
@@ -27,7 +25,7 @@
     /**
      * 新增SMI
      */
-    @RequestMapping(value = "/add")
+    @RequestMapping(value = "/deptPermission/add")
     @ResponseBody
     public Object addDeptPermission(@RequestBody DeptPermission deviceImei) {
         return deptPermissionService.addDeptPermission(deviceImei);
@@ -36,7 +34,7 @@
     /**
      * 更新SMI
      */
-    @RequestMapping(value = "/update")
+    @RequestMapping(value = "/deptPermission/update")
     @ResponseBody
     public Object editDeptPermission(@RequestBody DeptPermission deviceImei) {
         return deptPermissionService.editDeptPermission(deviceImei);
@@ -45,10 +43,16 @@
     /**
      * 删除imei
      */
-    @RequestMapping(value = "/delete/{id}")
+    @RequestMapping(value = "/deptPermission/delete/{id}")
     @ResponseBody
     public Object deleteDeptPermission(@PathVariable("id") Long id) {
         return deptPermissionService.deleteDeptPermission(id);
     }
 
+    @RequestMapping({"/dept/tree"})
+    @ResponseBody
+    public SuccessResponseData tree(String pid, String deptType,String tips) {
+        return new SuccessResponseData(this.deptPermissionService.treeDataByDept( pid, deptType, tips));
+    }
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/DeptPermissionConfigDao.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/DeptPermissionConfigDao.java
index 626303f..2c2eb1c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/DeptPermissionConfigDao.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/DeptPermissionConfigDao.java
@@ -1,7 +1,7 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.node.ZTreeNode;
 import com.casic.missiles.modular.system.model.DeptPermission;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -19,4 +19,8 @@
     String getDeviceName(@Param("deviceType") Long deviceType);
 
     String getWellName(@Param("pid") Long pid, @Param("wellType") String wellType);
+
+    List<ZTreeNode> treeDataByDept(@Param("pid") String pid, @Param("id") Long id,
+                                   @Param("deptType") String deptType, @Param("tips") String tips);
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionConfigMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionConfigMapper.xml
index 606d817..1796715 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionConfigMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionConfigMapper.xml
@@ -9,8 +9,30 @@
         <result column="dept_id" property="deptId"/>
     </resultMap>
 
+    <sql id="deptid_sql" databaseId="mysql">
+        CONCAT
+        ('%[',
+        #{pid,jdbcType=VARCHAR},
+        ']%'
+        )
+    </sql>
+
+    <sql id="deptid_sql" databaseId="pgsql">
+        CONCAT
+        ('%[',
+            #{pid,jdbcType=VARCHAR},
+            ']%'
+        )
+    </sql>
+    <sql id="deptid_sql" databaseId="oracle">
+        '%[' ||
+        #{pid,jdbcType=VARCHAR}
+        ||
+        ']%'
+    </sql>
+
     <!-- 通用查询结果列 -->
-    <select id="getListPage" resultType="MAP">
+    <select id="getListPage" resultType="java.util.Map">
         SELECT id,deptid,communication,well_type AS "wellType",device_type AS "deviceType",area,map,lng,lat
         FROM config_dept_permission
         WHERE 1=1
@@ -19,22 +41,53 @@
         </if>
     </select>
 
-    <select id="getPid" resultType="Long">
+    <select id="getPid" resultType="java.lang.Long">
        SELECT ID
 	   FROM sys_dict
 	   WHERE  code='sluicewellType'
     </select>
 
-    <select id="getDeviceName" resultType="String">
+    <select id="getDeviceName" resultType="java.lang.String">
         SELECT TYPE_NAME
         FROM   base_device_type
         WHERE id=#{deviceType}
     </select>
 
-    <select id="getWellName" resultType="String">
+    <select id="getWellName" resultType="java.lang.String">
        SELECT NAME
 	   FROM sys_dict
 	   WHERE  PID=#{pid}  AND  CODE=#{wellType}
     </select>
 
+
+    <select id="treeDataByDept" resultType="com.casic.missiles.core.node.ZTreeNode">
+        select id,pid as pId,simple_name as name,id as "deptId",
+        (
+        CASE
+        WHEN (pId = '0' OR pId IS NULL) THEN
+        'true'
+        ELSE
+        'false'
+        END
+        ) as isOpen from sys_dept
+        <where>
+            and del_flag = '0'
+            <if test='pid != null and pid != -1'>
+                and ( pids like
+                <include refid="deptid_sql"/>
+                )
+            </if>
+            <if test='id != null and id !=-1'>
+                or id=#{id}
+            </if>
+            <if test='deptType != null and deptType != ""'>
+                and dept_type = #{deptType}
+            </if>
+            <if test="tips != null and tips != ''">
+                and tips = #{tips}
+            </if>
+        </where>
+        ORDER BY pid,num
+    </select>
+
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/DeptPermissionConfigService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/DeptPermissionConfigService.java
index 60515e6..202e395 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/DeptPermissionConfigService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/DeptPermissionConfigService.java
@@ -1,9 +1,12 @@
 package com.casic.missiles.modular.system.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.node.ZTreeNode;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.DeptPermission;
 
+import java.util.List;
+
 public interface DeptPermissionConfigService {
 
     ResponseData deviceDeptPermissionList(String deptid);
@@ -14,4 +17,6 @@
 
     Object deleteDeptPermission(Long id);
 
+    List<ZTreeNode> treeDataByDept(String pid, String deptType, String tips);
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionConfigServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionConfigServiceImpl.java
index 5a0adf2..7bb3d82 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionConfigServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionConfigServiceImpl.java
@@ -6,13 +6,16 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.node.ZTreeNode;
 import com.casic.missiles.core.util.SpringContextHolder;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.DeptPermissionConfigDao;
 import com.casic.missiles.modular.system.model.DeptPermission;
 import com.casic.missiles.modular.system.service.DeptPermissionConfigService;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
 
@@ -24,6 +27,9 @@
 @Service
 public class DeptPermissionConfigServiceImpl extends ServiceImpl<DeptPermissionConfigDao, DeptPermission> implements DeptPermissionConfigService {
 
+    @Value("${casic.zjj_id}")
+    private String zjjId;
+
     private final AbstractPermissionContext permissionService;
 
     public DeptPermissionConfigServiceImpl(AbstractPermissionContext permissionService) {
@@ -33,7 +39,7 @@
     public ResponseData deviceDeptPermissionList(String deptid) {
         ResponseData responseData = new ResponseData();
         try {
-            List<Map<String, Object>> deptList = this.baseMapper.getListPage(StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid));
+            List<Map<String, Object>> deptList = this.baseMapper.getListPage(StrUtil.isEmpty(deptid) ? -1 : Long.valueOf(deptid));
             this.supplementData(deptList);
             responseData.setMessage("查询成功");
             responseData.setCode(200);
@@ -94,14 +100,25 @@
         return responseData;
     }
 
+    @Override
+    public List<ZTreeNode> treeDataByDept(String pid, String deptType, String tips) {
+        Long id = -1L;
+        if (StringUtils.isEmpty(pid)) {
+            pid = zjjId;
+            id = Long.valueOf(zjjId);
+        }
+        return this.baseMapper.treeDataByDept(pid, id, deptType, tips);
+    }
+
+
     private void supplementData(List<Map<String, Object>> deptList) {
         deptList.forEach(
                 dept -> {
                     dept.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(dept.get("deptid").toString())));
                     dept.put("wellTypeName", dept.get("wellType") == null ? "" : getWellTypeList(dept.get("wellType").toString()));
-                    dept.put("wellType", dept.get("wellType")==null?"":JSON.parseObject(dept.get("wellType").toString(), List.class));
+                    dept.put("wellType", dept.get("wellType") == null ? "" : JSON.parseObject(dept.get("wellType").toString(), List.class));
                     dept.put("deviceTypeName", dept.get("deviceType") == null ? "" : getDevcieTypeList(dept.get("deviceType").toString()));
-                    dept.put("deviceType",  dept.get("deviceType") == null ? "" :JSON.parseObject(dept.get("deviceType").toString(), List.class));
+                    dept.put("deviceType", dept.get("deviceType") == null ? "" : JSON.parseObject(dept.get("deviceType").toString(), List.class));
                 }
         );
     }
@@ -116,6 +133,7 @@
         return wellTypeNames.toString();
     }
 
+
     private String getDevcieTypeList(String devcieTypes) {
         StringBuffer devcieTypeNames = new StringBuffer();
         for (Object devcieType : JSON.parseObject(devcieTypes, List.class)) {

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 dcb9477..5e10696 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
@@ -89,7 +89,7 @@
      */
     @RequestMapping("/levelByType")
     @ResponseBody
-    public Object levelByType(Long tenantId, String name) {
+    public Object levelByType(Long tenantId, String name,String deviceType) {
         AuthUser currUser = permissionService.getAuthService().getLoginUser();
         if (ObjectUtil.isEmpty(tenantId)) {
             if (StrUtil.isEmpty(currUser.getTenantId())) {
@@ -98,7 +98,7 @@
             //当前用户所属组织机构关联的项目id
             tenantId = Long.valueOf(currUser.getTenantId());
         }
-        List<AlarmLevel> levelList = alarmLevelService.selectByNameAndTenList(tenantId, name);
+        List<AlarmLevel> levelList = alarmLevelService.selectByNameAndTenList(tenantId, name,deviceType);
         System.out.println(levelList.toString());
         return ResponseData.success(levelList);
     }
@@ -115,7 +115,7 @@
                 return ResponseData.error("无关联的项目id");
             }
             Long tenantId = ObjectUtil.isEmpty(alarmLevel.getTenantId()) ? Long.valueOf(userTenantId) : alarmLevel.getTenantId();
-            AlarmLevel oldAlarmLevel = alarmLevelService.selectByNameAndTenAndLevel(tenantId, alarmLevel.getName(), alarmLevel.getLevel());
+            AlarmLevel oldAlarmLevel = alarmLevelService.selectByNameAndTenAndLevel(tenantId, alarmLevel.getDeviceType(), alarmLevel.getName(),alarmLevel.getLevel());
             if (ObjectUtil.isEmpty(oldAlarmLevel)) {
                 //insert
                 alarmLevel.setTenantId(tenantId);
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java
index 1662422..038c1a8 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/IAlarmLevelService.java
@@ -22,9 +22,9 @@
 
     List<Map<String, Object>> getLevelList(Long tenantId,Long  deviceType);
 
-    List<AlarmLevel> selectByNameAndTenList(Long tenantId, String name);
+    List<AlarmLevel> selectByNameAndTenList(Long tenantId, String name,String deviceType);
 
-    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name, Integer level);
+    AlarmLevel selectByNameAndTenAndLevel(Long tenantId, Long deviceType,String name, Integer level);
 
     AlarmLevel selectByID(Long id);
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java
index 542fff2..fab6dc2 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmLevelServiceImpl.java
@@ -6,6 +6,7 @@
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.model.response.ResponseData;
@@ -16,6 +17,7 @@
 import com.casic.missiles.modular.system.model.AlarmLevel;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.sun.javafx.collections.MappingChange;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
@@ -45,13 +47,13 @@
     }
 
     @Override
-    public List<AlarmLevel> selectByNameAndTenList(Long tenantId, String name) {
-        return this.baseMapper.selectByNameAndTenList(tenantId, name);
+    public List<AlarmLevel> selectByNameAndTenList(Long tenantId, String name, String deviceType) {
+        return this.baseMapper.selectByNameAndTenList(tenantId, name, StringUtils.isEmpty(deviceType) ? -1L : Long.valueOf(deviceType));
     }
 
     @Override
-    public AlarmLevel selectByNameAndTenAndLevel(Long tenantId, String name, Integer level) {
-        return this.baseMapper.selectByNameAndTenAndLevel(tenantId, name, level);
+    public AlarmLevel selectByNameAndTenAndLevel(Long tenantId, Long deviceType, String name, Integer level) {
+        return this.baseMapper.selectByNameAndTenAndLevel(tenantId, ObjectUtils.isEmpty(deviceType) ? -1L :deviceType, name, level);
     }
 
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
index c54211e..3583918 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmLevelMapper.java
@@ -10,18 +10,22 @@
 
 /**
  * <p>
- *  Mapper 接口
+ * Mapper 接口
  * </p>
  *
  * @author 123
  * @since 2019-10-15
  */
 public interface AlarmLevelMapper extends BaseMapper<AlarmLevel> {
-    List<Map<String, Object>> getLevelList(@Param("tenantId")Long tenantId, @Param("deviceType")Long deviceType);
-    List<AlarmLevel> selectByNameAndTenList(@Param("tenantId")Long tenantId, @Param("name")String name);
-    AlarmLevel selectByNameAndTenAndLevel(@Param("tenantId")Long tenantId, @Param("name")String name, @Param("level") Integer level);
-    AlarmLevel selectByID(@Param("id")Long Id);
-    int deleteByCondition(@Param("deviceType")Long deviceType,
-                          @Param("name")String name,
-                          @Param("tenantId")Long tenantId);
+    List<Map<String, Object>> getLevelList(@Param("tenantId") Long tenantId, @Param("deviceType") Long deviceType);
+
+    List<AlarmLevel> selectByNameAndTenList(@Param("tenantId") Long tenantId, @Param("name") String name, @Param("deviceType") Long deviceType);
+
+    AlarmLevel selectByNameAndTenAndLevel(@Param("tenantId") Long tenantId, @Param("deviceType") Long deviceType,@Param("name") String name, @Param("level") Integer level);
+
+    AlarmLevel selectByID(@Param("id") Long Id);
+
+    int deleteByCondition(@Param("deviceType") Long deviceType,
+                          @Param("name") String name,
+                          @Param("tenantId") Long tenantId);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
index d9bb2f4..5961ae4 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmLevelMapper.xml
@@ -42,6 +42,9 @@
         <include refid="Base_Column_List"/>
         FROM alarm_level
         WHERE TENANT_ID = #{tenantId} AND NAME = #{name}
+        <if test="deviceType!=-1">
+            AND   DEVICE_TYPE = #{deviceType}
+        </if>
     </select>
 
     <select id="selectByNameAndTenAndLevel" resultType="com.casic.missiles.modular.system.model.AlarmLevel">
@@ -49,6 +52,9 @@
         <include refid="Base_Column_List"/>
         FROM alarm_level
         WHERE TENANT_ID = #{tenantId} AND NAME = #{name} AND LEVEL = #{level}
+        <if test="deviceType!=-1">
+            AND   DEVICE_TYPE = #{deviceType}
+        </if>
     </select>
 
     <select id="selectByID" resultType="com.casic.missiles.modular.system.model.AlarmLevel">
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java
index a399ba5..d6a1199 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/controller/DeptPermissionController.java
@@ -1,24 +1,22 @@
 package com.casic.missiles.modular.system.controller;
 
 import com.casic.missiles.core.base.controller.BaseController;
+import com.casic.missiles.model.response.SuccessResponseData;
 import com.casic.missiles.modular.system.model.DeptPermission;
 import com.casic.missiles.modular.system.service.DeptPermissionConfigService;
+import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
 @RestController
-@RequestMapping("/deptPermission")
+@RequiredArgsConstructor
 public class DeptPermissionController extends BaseController {
 
     private final DeptPermissionConfigService deptPermissionService;
 
-    public DeptPermissionController(DeptPermissionConfigService deptPermissionService) {
-        this.deptPermissionService = deptPermissionService;
-    }
-
     /**
      * 获取分页列表SMI
      */
-    @RequestMapping(value = "/list")
+    @RequestMapping(value = "/deptPermission/list")
     @ResponseBody
     public Object deviceDeptPermissionList(String deptid) {
         return deptPermissionService.deviceDeptPermissionList(deptid);
@@ -27,7 +25,7 @@
     /**
      * 新增SMI
      */
-    @RequestMapping(value = "/add")
+    @RequestMapping(value = "/deptPermission/add")
     @ResponseBody
     public Object addDeptPermission(@RequestBody DeptPermission deviceImei) {
         return deptPermissionService.addDeptPermission(deviceImei);
@@ -36,7 +34,7 @@
     /**
      * 更新SMI
      */
-    @RequestMapping(value = "/update")
+    @RequestMapping(value = "/deptPermission/update")
     @ResponseBody
     public Object editDeptPermission(@RequestBody DeptPermission deviceImei) {
         return deptPermissionService.editDeptPermission(deviceImei);
@@ -45,10 +43,16 @@
     /**
      * 删除imei
      */
-    @RequestMapping(value = "/delete/{id}")
+    @RequestMapping(value = "/deptPermission/delete/{id}")
     @ResponseBody
     public Object deleteDeptPermission(@PathVariable("id") Long id) {
         return deptPermissionService.deleteDeptPermission(id);
     }
 
+    @RequestMapping({"/dept/tree"})
+    @ResponseBody
+    public SuccessResponseData tree(String pid, String deptType,String tips) {
+        return new SuccessResponseData(this.deptPermissionService.treeDataByDept( pid, deptType, tips));
+    }
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/DeptPermissionConfigDao.java b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/DeptPermissionConfigDao.java
index 626303f..2c2eb1c 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/DeptPermissionConfigDao.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/DeptPermissionConfigDao.java
@@ -1,7 +1,7 @@
 package com.casic.missiles.modular.system.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.node.ZTreeNode;
 import com.casic.missiles.modular.system.model.DeptPermission;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -19,4 +19,8 @@
     String getDeviceName(@Param("deviceType") Long deviceType);
 
     String getWellName(@Param("pid") Long pid, @Param("wellType") String wellType);
+
+    List<ZTreeNode> treeDataByDept(@Param("pid") String pid, @Param("id") Long id,
+                                   @Param("deptType") String deptType, @Param("tips") String tips);
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionConfigMapper.xml b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionConfigMapper.xml
index 606d817..1796715 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionConfigMapper.xml
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/dao/mapping/DeptPermissionConfigMapper.xml
@@ -9,8 +9,30 @@
         <result column="dept_id" property="deptId"/>
     </resultMap>
 
+    <sql id="deptid_sql" databaseId="mysql">
+        CONCAT
+        ('%[',
+        #{pid,jdbcType=VARCHAR},
+        ']%'
+        )
+    </sql>
+
+    <sql id="deptid_sql" databaseId="pgsql">
+        CONCAT
+        ('%[',
+            #{pid,jdbcType=VARCHAR},
+            ']%'
+        )
+    </sql>
+    <sql id="deptid_sql" databaseId="oracle">
+        '%[' ||
+        #{pid,jdbcType=VARCHAR}
+        ||
+        ']%'
+    </sql>
+
     <!-- 通用查询结果列 -->
-    <select id="getListPage" resultType="MAP">
+    <select id="getListPage" resultType="java.util.Map">
         SELECT id,deptid,communication,well_type AS "wellType",device_type AS "deviceType",area,map,lng,lat
         FROM config_dept_permission
         WHERE 1=1
@@ -19,22 +41,53 @@
         </if>
     </select>
 
-    <select id="getPid" resultType="Long">
+    <select id="getPid" resultType="java.lang.Long">
        SELECT ID
 	   FROM sys_dict
 	   WHERE  code='sluicewellType'
     </select>
 
-    <select id="getDeviceName" resultType="String">
+    <select id="getDeviceName" resultType="java.lang.String">
         SELECT TYPE_NAME
         FROM   base_device_type
         WHERE id=#{deviceType}
     </select>
 
-    <select id="getWellName" resultType="String">
+    <select id="getWellName" resultType="java.lang.String">
        SELECT NAME
 	   FROM sys_dict
 	   WHERE  PID=#{pid}  AND  CODE=#{wellType}
     </select>
 
+
+    <select id="treeDataByDept" resultType="com.casic.missiles.core.node.ZTreeNode">
+        select id,pid as pId,simple_name as name,id as "deptId",
+        (
+        CASE
+        WHEN (pId = '0' OR pId IS NULL) THEN
+        'true'
+        ELSE
+        'false'
+        END
+        ) as isOpen from sys_dept
+        <where>
+            and del_flag = '0'
+            <if test='pid != null and pid != -1'>
+                and ( pids like
+                <include refid="deptid_sql"/>
+                )
+            </if>
+            <if test='id != null and id !=-1'>
+                or id=#{id}
+            </if>
+            <if test='deptType != null and deptType != ""'>
+                and dept_type = #{deptType}
+            </if>
+            <if test="tips != null and tips != ''">
+                and tips = #{tips}
+            </if>
+        </where>
+        ORDER BY pid,num
+    </select>
+
 </mapper>
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/DeptPermissionConfigService.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/DeptPermissionConfigService.java
index 60515e6..202e395 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/DeptPermissionConfigService.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/DeptPermissionConfigService.java
@@ -1,9 +1,12 @@
 package com.casic.missiles.modular.system.service;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.casic.missiles.core.node.ZTreeNode;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.model.DeptPermission;
 
+import java.util.List;
+
 public interface DeptPermissionConfigService {
 
     ResponseData deviceDeptPermissionList(String deptid);
@@ -14,4 +17,6 @@
 
     Object deleteDeptPermission(Long id);
 
+    List<ZTreeNode> treeDataByDept(String pid, String deptType, String tips);
+
 }
diff --git a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionConfigServiceImpl.java b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionConfigServiceImpl.java
index 5a0adf2..7bb3d82 100644
--- a/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionConfigServiceImpl.java
+++ b/casic-server/src/main/java/com/casic/missiles/modular/system/service/impl/DeptPermissionConfigServiceImpl.java
@@ -6,13 +6,16 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.casic.missiles.core.application.context.AbstractPermissionContext;
+import com.casic.missiles.core.node.ZTreeNode;
 import com.casic.missiles.core.util.SpringContextHolder;
 import com.casic.missiles.model.response.ResponseData;
 import com.casic.missiles.modular.system.dao.DeptPermissionConfigDao;
 import com.casic.missiles.modular.system.model.DeptPermission;
 import com.casic.missiles.modular.system.service.DeptPermissionConfigService;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.dao.DataAccessException;
 import org.springframework.stereotype.Service;
 
@@ -24,6 +27,9 @@
 @Service
 public class DeptPermissionConfigServiceImpl extends ServiceImpl<DeptPermissionConfigDao, DeptPermission> implements DeptPermissionConfigService {
 
+    @Value("${casic.zjj_id}")
+    private String zjjId;
+
     private final AbstractPermissionContext permissionService;
 
     public DeptPermissionConfigServiceImpl(AbstractPermissionContext permissionService) {
@@ -33,7 +39,7 @@
     public ResponseData deviceDeptPermissionList(String deptid) {
         ResponseData responseData = new ResponseData();
         try {
-            List<Map<String, Object>> deptList = this.baseMapper.getListPage(StrUtil.isEmpty(deptid)?-1:Long.valueOf(deptid));
+            List<Map<String, Object>> deptList = this.baseMapper.getListPage(StrUtil.isEmpty(deptid) ? -1 : Long.valueOf(deptid));
             this.supplementData(deptList);
             responseData.setMessage("查询成功");
             responseData.setCode(200);
@@ -94,14 +100,25 @@
         return responseData;
     }
 
+    @Override
+    public List<ZTreeNode> treeDataByDept(String pid, String deptType, String tips) {
+        Long id = -1L;
+        if (StringUtils.isEmpty(pid)) {
+            pid = zjjId;
+            id = Long.valueOf(zjjId);
+        }
+        return this.baseMapper.treeDataByDept(pid, id, deptType, tips);
+    }
+
+
     private void supplementData(List<Map<String, Object>> deptList) {
         deptList.forEach(
                 dept -> {
                     dept.put("deptName", permissionService.getDeptService().getDeptName(Long.valueOf(dept.get("deptid").toString())));
                     dept.put("wellTypeName", dept.get("wellType") == null ? "" : getWellTypeList(dept.get("wellType").toString()));
-                    dept.put("wellType", dept.get("wellType")==null?"":JSON.parseObject(dept.get("wellType").toString(), List.class));
+                    dept.put("wellType", dept.get("wellType") == null ? "" : JSON.parseObject(dept.get("wellType").toString(), List.class));
                     dept.put("deviceTypeName", dept.get("deviceType") == null ? "" : getDevcieTypeList(dept.get("deviceType").toString()));
-                    dept.put("deviceType",  dept.get("deviceType") == null ? "" :JSON.parseObject(dept.get("deviceType").toString(), List.class));
+                    dept.put("deviceType", dept.get("deviceType") == null ? "" : JSON.parseObject(dept.get("deviceType").toString(), List.class));
                 }
         );
     }
@@ -116,6 +133,7 @@
         return wellTypeNames.toString();
     }
 
+
     private String getDevcieTypeList(String devcieTypes) {
         StringBuffer devcieTypeNames = new StringBuffer();
         for (Object devcieType : JSON.parseObject(devcieTypes, List.class)) {
diff --git a/casic-web/src/main/resources/config/application-postgre.yml b/casic-web/src/main/resources/config/application-postgre.yml
index 39dfb3b..0cec371 100644
--- a/casic-web/src/main/resources/config/application-postgre.yml
+++ b/casic-web/src/main/resources/config/application-postgre.yml
@@ -29,6 +29,7 @@
 #flowable数据源和多数据源配置
 casic:
   kaptcha-open: false #是否开启登录时验证码 (true/false)
+  zjj_id: 1559096734123003906
   #kaptcha-open: false #是否开启登录时验证码 (true/false)
   no-login-urls: ${casic.sysUrl}/user/login,${casic.sysUrl}/user/appLogin,${casic.sysUrl}/kaptcha/base64,${casic.sysUrl}/config/baseConfig,/route/mockToken,/websocket/*,/job/updateSinkJob
   db: