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 7baf8cb..42089e8 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
@@ -135,6 +135,10 @@
     @RequestMapping(value = "/level/add", method = RequestMethod.POST)
     @ResponseBody
     public Object add( AlarmLevelParam alarmLevelParam) {
+        if(ObjectUtils.isEmpty(alarmLevelParam.getTenantId())){
+            AuthUser currUser = permissionService.getAuthService().getLoginUser();
+            alarmLevelParam.setTenantId(currUser.getId());
+        }
         return alarmLevelService.addAlarmLevel(alarmLevelParam);
     }
 

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 7baf8cb..42089e8 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
@@ -135,6 +135,10 @@
     @RequestMapping(value = "/level/add", method = RequestMethod.POST)
     @ResponseBody
     public Object add( AlarmLevelParam alarmLevelParam) {
+        if(ObjectUtils.isEmpty(alarmLevelParam.getTenantId())){
+            AuthUser currUser = permissionService.getAuthService().getLoginUser();
+            alarmLevelParam.setTenantId(currUser.getId());
+        }
         return alarmLevelService.addAlarmLevel(alarmLevelParam);
     }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
index 33e906e..3267856 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
@@ -12,7 +12,7 @@
     private String lng;
     private String lat;
 
-    private String tenantId;
+    private Long tenantId;
     private String name;
     private String deviceType;
     private String openAlarm;

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 7baf8cb..42089e8 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
@@ -135,6 +135,10 @@
     @RequestMapping(value = "/level/add", method = RequestMethod.POST)
     @ResponseBody
     public Object add( AlarmLevelParam alarmLevelParam) {
+        if(ObjectUtils.isEmpty(alarmLevelParam.getTenantId())){
+            AuthUser currUser = permissionService.getAuthService().getLoginUser();
+            alarmLevelParam.setTenantId(currUser.getId());
+        }
         return alarmLevelService.addAlarmLevel(alarmLevelParam);
     }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
index 33e906e..3267856 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
@@ -12,7 +12,7 @@
     private String lng;
     private String lat;
 
-    private String tenantId;
+    private Long tenantId;
     private String name;
     private String deviceType;
     private String openAlarm;
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 59ae646..9404eda 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
@@ -109,7 +109,7 @@
         AlarmLevel alarmLevel = new AlarmLevel();
         alarmLevel.setName(alarmLevelParam.getName());
         alarmLevel.setOpenJob(alarmLevelParam.getOpenJob());
-        alarmLevel.setTenantId(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getTenantId()) ? "-1" : alarmLevelParam.getTenantId()));
+        alarmLevel.setTenantId(alarmLevelParam.getTenantId());
         alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType()));
         alarmLevel.setHighValue(Float.valueOf(StrUtil.isEmpty(alarmLevelParam.getHighValue()) ? "-1" : alarmLevelParam.getDeviceType()));
         alarmLevel.setLowValue(Float.valueOf(StrUtil.isEmpty(alarmLevelParam.getLowValue()) ? "-1" : alarmLevelParam.getDeviceType()));

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 7baf8cb..42089e8 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
@@ -135,6 +135,10 @@
     @RequestMapping(value = "/level/add", method = RequestMethod.POST)
     @ResponseBody
     public Object add( AlarmLevelParam alarmLevelParam) {
+        if(ObjectUtils.isEmpty(alarmLevelParam.getTenantId())){
+            AuthUser currUser = permissionService.getAuthService().getLoginUser();
+            alarmLevelParam.setTenantId(currUser.getId());
+        }
         return alarmLevelService.addAlarmLevel(alarmLevelParam);
     }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
index 33e906e..3267856 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
@@ -12,7 +12,7 @@
     private String lng;
     private String lat;
 
-    private String tenantId;
+    private Long tenantId;
     private String name;
     private String deviceType;
     private String openAlarm;
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 59ae646..9404eda 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
@@ -109,7 +109,7 @@
         AlarmLevel alarmLevel = new AlarmLevel();
         alarmLevel.setName(alarmLevelParam.getName());
         alarmLevel.setOpenJob(alarmLevelParam.getOpenJob());
-        alarmLevel.setTenantId(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getTenantId()) ? "-1" : alarmLevelParam.getTenantId()));
+        alarmLevel.setTenantId(alarmLevelParam.getTenantId());
         alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType()));
         alarmLevel.setHighValue(Float.valueOf(StrUtil.isEmpty(alarmLevelParam.getHighValue()) ? "-1" : alarmLevelParam.getDeviceType()));
         alarmLevel.setLowValue(Float.valueOf(StrUtil.isEmpty(alarmLevelParam.getLowValue()) ? "-1" : alarmLevelParam.getDeviceType()));
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java
index bdae77d..34cf78b 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java
@@ -49,10 +49,10 @@
      */
     @RequestMapping(value = "/alarmNow")
     @ResponseBody
-    public Object alarmNow() {
+    public Object alarmNow(String alarmType) {
         // 查询当前有效的报警记录（status=1）
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<AlarmNowView> alarmNowViewList = alarmNowViewService.getNowAlarmRecords(dataScope);
+        List<AlarmNowView> alarmNowViewList = alarmNowViewService.getNowAlarmRecords(dataScope,alarmType);
         SuccessResponseData successResult = new SuccessResponseData();
         successResult.setData(alarmNowViewList);
         successResult.setMessage("success");

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 7baf8cb..42089e8 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
@@ -135,6 +135,10 @@
     @RequestMapping(value = "/level/add", method = RequestMethod.POST)
     @ResponseBody
     public Object add( AlarmLevelParam alarmLevelParam) {
+        if(ObjectUtils.isEmpty(alarmLevelParam.getTenantId())){
+            AuthUser currUser = permissionService.getAuthService().getLoginUser();
+            alarmLevelParam.setTenantId(currUser.getId());
+        }
         return alarmLevelService.addAlarmLevel(alarmLevelParam);
     }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
index 33e906e..3267856 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
@@ -12,7 +12,7 @@
     private String lng;
     private String lat;
 
-    private String tenantId;
+    private Long tenantId;
     private String name;
     private String deviceType;
     private String openAlarm;
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 59ae646..9404eda 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
@@ -109,7 +109,7 @@
         AlarmLevel alarmLevel = new AlarmLevel();
         alarmLevel.setName(alarmLevelParam.getName());
         alarmLevel.setOpenJob(alarmLevelParam.getOpenJob());
-        alarmLevel.setTenantId(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getTenantId()) ? "-1" : alarmLevelParam.getTenantId()));
+        alarmLevel.setTenantId(alarmLevelParam.getTenantId());
         alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType()));
         alarmLevel.setHighValue(Float.valueOf(StrUtil.isEmpty(alarmLevelParam.getHighValue()) ? "-1" : alarmLevelParam.getDeviceType()));
         alarmLevel.setLowValue(Float.valueOf(StrUtil.isEmpty(alarmLevelParam.getLowValue()) ? "-1" : alarmLevelParam.getDeviceType()));
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java
index bdae77d..34cf78b 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java
@@ -49,10 +49,10 @@
      */
     @RequestMapping(value = "/alarmNow")
     @ResponseBody
-    public Object alarmNow() {
+    public Object alarmNow(String alarmType) {
         // 查询当前有效的报警记录（status=1）
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<AlarmNowView> alarmNowViewList = alarmNowViewService.getNowAlarmRecords(dataScope);
+        List<AlarmNowView> alarmNowViewList = alarmNowViewService.getNowAlarmRecords(dataScope,alarmType);
         SuccessResponseData successResult = new SuccessResponseData();
         successResult.setData(alarmNowViewList);
         successResult.setMessage("success");
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmNowViewMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmNowViewMapper.java
index a15ffc2..12a476c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmNowViewMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmNowViewMapper.java
@@ -18,7 +18,7 @@
  */
 public interface AlarmNowViewMapper extends BaseMapper<AlarmNowView> {
 
-    List<AlarmNowView> getNowAlarmRecords(@Param("scope") DataScope dataScope);
+    List<AlarmNowView> getNowAlarmRecords(@Param("scope") DataScope dataScope,@Param("alarmType")String alarmType);
 
     List<AlarmNowView> getAlarmsByWell(@Param("id") 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 7baf8cb..42089e8 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
@@ -135,6 +135,10 @@
     @RequestMapping(value = "/level/add", method = RequestMethod.POST)
     @ResponseBody
     public Object add( AlarmLevelParam alarmLevelParam) {
+        if(ObjectUtils.isEmpty(alarmLevelParam.getTenantId())){
+            AuthUser currUser = permissionService.getAuthService().getLoginUser();
+            alarmLevelParam.setTenantId(currUser.getId());
+        }
         return alarmLevelService.addAlarmLevel(alarmLevelParam);
     }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
index 33e906e..3267856 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
@@ -12,7 +12,7 @@
     private String lng;
     private String lat;
 
-    private String tenantId;
+    private Long tenantId;
     private String name;
     private String deviceType;
     private String openAlarm;
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 59ae646..9404eda 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
@@ -109,7 +109,7 @@
         AlarmLevel alarmLevel = new AlarmLevel();
         alarmLevel.setName(alarmLevelParam.getName());
         alarmLevel.setOpenJob(alarmLevelParam.getOpenJob());
-        alarmLevel.setTenantId(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getTenantId()) ? "-1" : alarmLevelParam.getTenantId()));
+        alarmLevel.setTenantId(alarmLevelParam.getTenantId());
         alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType()));
         alarmLevel.setHighValue(Float.valueOf(StrUtil.isEmpty(alarmLevelParam.getHighValue()) ? "-1" : alarmLevelParam.getDeviceType()));
         alarmLevel.setLowValue(Float.valueOf(StrUtil.isEmpty(alarmLevelParam.getLowValue()) ? "-1" : alarmLevelParam.getDeviceType()));
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java
index bdae77d..34cf78b 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java
@@ -49,10 +49,10 @@
      */
     @RequestMapping(value = "/alarmNow")
     @ResponseBody
-    public Object alarmNow() {
+    public Object alarmNow(String alarmType) {
         // 查询当前有效的报警记录（status=1）
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<AlarmNowView> alarmNowViewList = alarmNowViewService.getNowAlarmRecords(dataScope);
+        List<AlarmNowView> alarmNowViewList = alarmNowViewService.getNowAlarmRecords(dataScope,alarmType);
         SuccessResponseData successResult = new SuccessResponseData();
         successResult.setData(alarmNowViewList);
         successResult.setMessage("success");
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmNowViewMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmNowViewMapper.java
index a15ffc2..12a476c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmNowViewMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmNowViewMapper.java
@@ -18,7 +18,7 @@
  */
 public interface AlarmNowViewMapper extends BaseMapper<AlarmNowView> {
 
-    List<AlarmNowView> getNowAlarmRecords(@Param("scope") DataScope dataScope);
+    List<AlarmNowView> getNowAlarmRecords(@Param("scope") DataScope dataScope,@Param("alarmType")String alarmType);
 
     List<AlarmNowView> getAlarmsByWell(@Param("id") Long id);
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
index 3ce3733..bf7059d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
@@ -559,7 +559,7 @@
 
     <select id="jobListApp" resultType="map">
         SELECT<include refid="job_list_column"/>,
-        (JOB_BELONG_TO = #{userId} OR JOB_BELONG_TO IS NULL) AS editable
+        CASE  WHEN 	JOB_BELONG_TO  <![CDATA[ <> ]]>  #{userId}  THEN  0 ELSE 1 END  AS editable
         FROM alarm_job aj
         LEFT JOIN alarm_records ar ON (aj.ID = ar.JOB_ID AND ar.ID IN ( SELECT MAX(ID) FROM alarm_records GROUP BY
         JOB_ID))
@@ -661,7 +661,7 @@
 
     <select id="jobListDelayReApp" resultType="map">
         SELECT<include refid="job_list_column"/>,
-        (JOB_BELONG_TO = #{userId} OR JOB_BELONG_TO IS NULL) AS editable
+        CASE  WHEN 	JOB_BELONG_TO  <![CDATA[ <> ]]>  #{userId}  THEN  0 ELSE 1 END  AS editable
         FROM alarm_job aj
         LEFT JOIN alarm_records ar ON (aj.ID = ar.JOB_ID AND ar.ID IN ( SELECT MAX(ID) FROM alarm_records GROUP BY
         JOB_ID))
@@ -736,7 +736,7 @@
 
     <select id="jobListDelayProApp" resultType="map">
         SELECT<include refid="job_list_column"/>,
-        (JOB_BELONG_TO = #{userId} OR JOB_BELONG_TO IS NULL) AS editable
+        CASE  WHEN 	JOB_BELONG_TO  <![CDATA[ <> ]]>  #{userId}  THEN  0 ELSE 1 END  AS editable
         FROM alarm_job aj
         LEFT JOIN alarm_records ar ON (aj.ID = ar.JOB_ID AND ar.ID IN ( SELECT MAX(ID) FROM alarm_records GROUP BY
         JOB_ID))
@@ -782,7 +782,7 @@
 
     <select id="jobListSearch" resultType="map">
         SELECT<include refid="job_list_column"/>,
-        (JOB_BELONG_TO = #{userId} OR JOB_BELONG_TO IS NULL) AS editable
+        CASE  WHEN 	JOB_BELONG_TO  <![CDATA[ <> ]]>  #{userId}  THEN  0 ELSE 1 END  AS editable
         FROM alarm_job aj
         LEFT JOIN alarm_records ar ON (aj.ID = ar.JOB_ID AND ar.ID IN ( SELECT MAX(ID) FROM alarm_records GROUP BY
         JOB_ID))
@@ -868,8 +868,9 @@
     </select>
 
     <select id="jobListSearchApp" resultType="map">
-        SELECT<include refid="job_list_column"/>,
-        (JOB_BELONG_TO = #{userId} OR JOB_BELONG_TO IS NULL) AS editable
+        SELECT
+        CASE  WHEN 	JOB_BELONG_TO  <![CDATA[ <> ]]>  #{userId}  THEN  0 ELSE 1 END  AS editable,
+        <include refid="job_list_column"/>
         FROM alarm_job aj
         LEFT JOIN alarm_records ar ON (aj.ID = ar.JOB_ID AND ar.ID IN ( SELECT MAX(ID) FROM alarm_records GROUP BY
         JOB_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 7baf8cb..42089e8 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
@@ -135,6 +135,10 @@
     @RequestMapping(value = "/level/add", method = RequestMethod.POST)
     @ResponseBody
     public Object add( AlarmLevelParam alarmLevelParam) {
+        if(ObjectUtils.isEmpty(alarmLevelParam.getTenantId())){
+            AuthUser currUser = permissionService.getAuthService().getLoginUser();
+            alarmLevelParam.setTenantId(currUser.getId());
+        }
         return alarmLevelService.addAlarmLevel(alarmLevelParam);
     }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
index 33e906e..3267856 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
@@ -12,7 +12,7 @@
     private String lng;
     private String lat;
 
-    private String tenantId;
+    private Long tenantId;
     private String name;
     private String deviceType;
     private String openAlarm;
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 59ae646..9404eda 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
@@ -109,7 +109,7 @@
         AlarmLevel alarmLevel = new AlarmLevel();
         alarmLevel.setName(alarmLevelParam.getName());
         alarmLevel.setOpenJob(alarmLevelParam.getOpenJob());
-        alarmLevel.setTenantId(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getTenantId()) ? "-1" : alarmLevelParam.getTenantId()));
+        alarmLevel.setTenantId(alarmLevelParam.getTenantId());
         alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType()));
         alarmLevel.setHighValue(Float.valueOf(StrUtil.isEmpty(alarmLevelParam.getHighValue()) ? "-1" : alarmLevelParam.getDeviceType()));
         alarmLevel.setLowValue(Float.valueOf(StrUtil.isEmpty(alarmLevelParam.getLowValue()) ? "-1" : alarmLevelParam.getDeviceType()));
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java
index bdae77d..34cf78b 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java
@@ -49,10 +49,10 @@
      */
     @RequestMapping(value = "/alarmNow")
     @ResponseBody
-    public Object alarmNow() {
+    public Object alarmNow(String alarmType) {
         // 查询当前有效的报警记录（status=1）
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<AlarmNowView> alarmNowViewList = alarmNowViewService.getNowAlarmRecords(dataScope);
+        List<AlarmNowView> alarmNowViewList = alarmNowViewService.getNowAlarmRecords(dataScope,alarmType);
         SuccessResponseData successResult = new SuccessResponseData();
         successResult.setData(alarmNowViewList);
         successResult.setMessage("success");
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmNowViewMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmNowViewMapper.java
index a15ffc2..12a476c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmNowViewMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmNowViewMapper.java
@@ -18,7 +18,7 @@
  */
 public interface AlarmNowViewMapper extends BaseMapper<AlarmNowView> {
 
-    List<AlarmNowView> getNowAlarmRecords(@Param("scope") DataScope dataScope);
+    List<AlarmNowView> getNowAlarmRecords(@Param("scope") DataScope dataScope,@Param("alarmType")String alarmType);
 
     List<AlarmNowView> getAlarmsByWell(@Param("id") Long id);
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
index 3ce3733..bf7059d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
@@ -559,7 +559,7 @@
 
     <select id="jobListApp" resultType="map">
         SELECT<include refid="job_list_column"/>,
-        (JOB_BELONG_TO = #{userId} OR JOB_BELONG_TO IS NULL) AS editable
+        CASE  WHEN 	JOB_BELONG_TO  <![CDATA[ <> ]]>  #{userId}  THEN  0 ELSE 1 END  AS editable
         FROM alarm_job aj
         LEFT JOIN alarm_records ar ON (aj.ID = ar.JOB_ID AND ar.ID IN ( SELECT MAX(ID) FROM alarm_records GROUP BY
         JOB_ID))
@@ -661,7 +661,7 @@
 
     <select id="jobListDelayReApp" resultType="map">
         SELECT<include refid="job_list_column"/>,
-        (JOB_BELONG_TO = #{userId} OR JOB_BELONG_TO IS NULL) AS editable
+        CASE  WHEN 	JOB_BELONG_TO  <![CDATA[ <> ]]>  #{userId}  THEN  0 ELSE 1 END  AS editable
         FROM alarm_job aj
         LEFT JOIN alarm_records ar ON (aj.ID = ar.JOB_ID AND ar.ID IN ( SELECT MAX(ID) FROM alarm_records GROUP BY
         JOB_ID))
@@ -736,7 +736,7 @@
 
     <select id="jobListDelayProApp" resultType="map">
         SELECT<include refid="job_list_column"/>,
-        (JOB_BELONG_TO = #{userId} OR JOB_BELONG_TO IS NULL) AS editable
+        CASE  WHEN 	JOB_BELONG_TO  <![CDATA[ <> ]]>  #{userId}  THEN  0 ELSE 1 END  AS editable
         FROM alarm_job aj
         LEFT JOIN alarm_records ar ON (aj.ID = ar.JOB_ID AND ar.ID IN ( SELECT MAX(ID) FROM alarm_records GROUP BY
         JOB_ID))
@@ -782,7 +782,7 @@
 
     <select id="jobListSearch" resultType="map">
         SELECT<include refid="job_list_column"/>,
-        (JOB_BELONG_TO = #{userId} OR JOB_BELONG_TO IS NULL) AS editable
+        CASE  WHEN 	JOB_BELONG_TO  <![CDATA[ <> ]]>  #{userId}  THEN  0 ELSE 1 END  AS editable
         FROM alarm_job aj
         LEFT JOIN alarm_records ar ON (aj.ID = ar.JOB_ID AND ar.ID IN ( SELECT MAX(ID) FROM alarm_records GROUP BY
         JOB_ID))
@@ -868,8 +868,9 @@
     </select>
 
     <select id="jobListSearchApp" resultType="map">
-        SELECT<include refid="job_list_column"/>,
-        (JOB_BELONG_TO = #{userId} OR JOB_BELONG_TO IS NULL) AS editable
+        SELECT
+        CASE  WHEN 	JOB_BELONG_TO  <![CDATA[ <> ]]>  #{userId}  THEN  0 ELSE 1 END  AS editable,
+        <include refid="job_list_column"/>
         FROM alarm_job aj
         LEFT JOIN alarm_records ar ON (aj.ID = ar.JOB_ID AND ar.ID IN ( SELECT MAX(ID) FROM alarm_records GROUP BY
         JOB_ID))
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
index 7c45564..bc5063d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
@@ -19,6 +19,9 @@
         <include refid="Base_Column_List"/>
         FROM alarm_now_view w
         WHERE 1 = 1
+        <if test="alarmType!='' and alarmType!=null">
+            AND alarmtype = #{alarmType}
+        </if>
         ORDER BY alarmTimeDate DESC
     </select>
 

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 7baf8cb..42089e8 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
@@ -135,6 +135,10 @@
     @RequestMapping(value = "/level/add", method = RequestMethod.POST)
     @ResponseBody
     public Object add( AlarmLevelParam alarmLevelParam) {
+        if(ObjectUtils.isEmpty(alarmLevelParam.getTenantId())){
+            AuthUser currUser = permissionService.getAuthService().getLoginUser();
+            alarmLevelParam.setTenantId(currUser.getId());
+        }
         return alarmLevelService.addAlarmLevel(alarmLevelParam);
     }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
index 33e906e..3267856 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
@@ -12,7 +12,7 @@
     private String lng;
     private String lat;
 
-    private String tenantId;
+    private Long tenantId;
     private String name;
     private String deviceType;
     private String openAlarm;
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 59ae646..9404eda 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
@@ -109,7 +109,7 @@
         AlarmLevel alarmLevel = new AlarmLevel();
         alarmLevel.setName(alarmLevelParam.getName());
         alarmLevel.setOpenJob(alarmLevelParam.getOpenJob());
-        alarmLevel.setTenantId(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getTenantId()) ? "-1" : alarmLevelParam.getTenantId()));
+        alarmLevel.setTenantId(alarmLevelParam.getTenantId());
         alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType()));
         alarmLevel.setHighValue(Float.valueOf(StrUtil.isEmpty(alarmLevelParam.getHighValue()) ? "-1" : alarmLevelParam.getDeviceType()));
         alarmLevel.setLowValue(Float.valueOf(StrUtil.isEmpty(alarmLevelParam.getLowValue()) ? "-1" : alarmLevelParam.getDeviceType()));
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java
index bdae77d..34cf78b 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java
@@ -49,10 +49,10 @@
      */
     @RequestMapping(value = "/alarmNow")
     @ResponseBody
-    public Object alarmNow() {
+    public Object alarmNow(String alarmType) {
         // 查询当前有效的报警记录（status=1）
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<AlarmNowView> alarmNowViewList = alarmNowViewService.getNowAlarmRecords(dataScope);
+        List<AlarmNowView> alarmNowViewList = alarmNowViewService.getNowAlarmRecords(dataScope,alarmType);
         SuccessResponseData successResult = new SuccessResponseData();
         successResult.setData(alarmNowViewList);
         successResult.setMessage("success");
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmNowViewMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmNowViewMapper.java
index a15ffc2..12a476c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmNowViewMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmNowViewMapper.java
@@ -18,7 +18,7 @@
  */
 public interface AlarmNowViewMapper extends BaseMapper<AlarmNowView> {
 
-    List<AlarmNowView> getNowAlarmRecords(@Param("scope") DataScope dataScope);
+    List<AlarmNowView> getNowAlarmRecords(@Param("scope") DataScope dataScope,@Param("alarmType")String alarmType);
 
     List<AlarmNowView> getAlarmsByWell(@Param("id") Long id);
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
index 3ce3733..bf7059d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
@@ -559,7 +559,7 @@
 
     <select id="jobListApp" resultType="map">
         SELECT<include refid="job_list_column"/>,
-        (JOB_BELONG_TO = #{userId} OR JOB_BELONG_TO IS NULL) AS editable
+        CASE  WHEN 	JOB_BELONG_TO  <![CDATA[ <> ]]>  #{userId}  THEN  0 ELSE 1 END  AS editable
         FROM alarm_job aj
         LEFT JOIN alarm_records ar ON (aj.ID = ar.JOB_ID AND ar.ID IN ( SELECT MAX(ID) FROM alarm_records GROUP BY
         JOB_ID))
@@ -661,7 +661,7 @@
 
     <select id="jobListDelayReApp" resultType="map">
         SELECT<include refid="job_list_column"/>,
-        (JOB_BELONG_TO = #{userId} OR JOB_BELONG_TO IS NULL) AS editable
+        CASE  WHEN 	JOB_BELONG_TO  <![CDATA[ <> ]]>  #{userId}  THEN  0 ELSE 1 END  AS editable
         FROM alarm_job aj
         LEFT JOIN alarm_records ar ON (aj.ID = ar.JOB_ID AND ar.ID IN ( SELECT MAX(ID) FROM alarm_records GROUP BY
         JOB_ID))
@@ -736,7 +736,7 @@
 
     <select id="jobListDelayProApp" resultType="map">
         SELECT<include refid="job_list_column"/>,
-        (JOB_BELONG_TO = #{userId} OR JOB_BELONG_TO IS NULL) AS editable
+        CASE  WHEN 	JOB_BELONG_TO  <![CDATA[ <> ]]>  #{userId}  THEN  0 ELSE 1 END  AS editable
         FROM alarm_job aj
         LEFT JOIN alarm_records ar ON (aj.ID = ar.JOB_ID AND ar.ID IN ( SELECT MAX(ID) FROM alarm_records GROUP BY
         JOB_ID))
@@ -782,7 +782,7 @@
 
     <select id="jobListSearch" resultType="map">
         SELECT<include refid="job_list_column"/>,
-        (JOB_BELONG_TO = #{userId} OR JOB_BELONG_TO IS NULL) AS editable
+        CASE  WHEN 	JOB_BELONG_TO  <![CDATA[ <> ]]>  #{userId}  THEN  0 ELSE 1 END  AS editable
         FROM alarm_job aj
         LEFT JOIN alarm_records ar ON (aj.ID = ar.JOB_ID AND ar.ID IN ( SELECT MAX(ID) FROM alarm_records GROUP BY
         JOB_ID))
@@ -868,8 +868,9 @@
     </select>
 
     <select id="jobListSearchApp" resultType="map">
-        SELECT<include refid="job_list_column"/>,
-        (JOB_BELONG_TO = #{userId} OR JOB_BELONG_TO IS NULL) AS editable
+        SELECT
+        CASE  WHEN 	JOB_BELONG_TO  <![CDATA[ <> ]]>  #{userId}  THEN  0 ELSE 1 END  AS editable,
+        <include refid="job_list_column"/>
         FROM alarm_job aj
         LEFT JOIN alarm_records ar ON (aj.ID = ar.JOB_ID AND ar.ID IN ( SELECT MAX(ID) FROM alarm_records GROUP BY
         JOB_ID))
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
index 7c45564..bc5063d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
@@ -19,6 +19,9 @@
         <include refid="Base_Column_List"/>
         FROM alarm_now_view w
         WHERE 1 = 1
+        <if test="alarmType!='' and alarmType!=null">
+            AND alarmtype = #{alarmType}
+        </if>
         ORDER BY alarmTimeDate DESC
     </select>
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IAlarmNowViewService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IAlarmNowViewService.java
index f851173..218a145 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IAlarmNowViewService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IAlarmNowViewService.java
@@ -16,6 +16,6 @@
  */
 public interface IAlarmNowViewService extends IService<AlarmNowView> {
 
-    List<AlarmNowView> getNowAlarmRecords(DataScope dataScope);
+    List<AlarmNowView> getNowAlarmRecords(DataScope dataScope,String alarmType);
     List<AlarmNowView> getAlarmsByWell(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 7baf8cb..42089e8 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
@@ -135,6 +135,10 @@
     @RequestMapping(value = "/level/add", method = RequestMethod.POST)
     @ResponseBody
     public Object add( AlarmLevelParam alarmLevelParam) {
+        if(ObjectUtils.isEmpty(alarmLevelParam.getTenantId())){
+            AuthUser currUser = permissionService.getAuthService().getLoginUser();
+            alarmLevelParam.setTenantId(currUser.getId());
+        }
         return alarmLevelService.addAlarmLevel(alarmLevelParam);
     }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
index 33e906e..3267856 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/model/AlarmLevelParam.java
@@ -12,7 +12,7 @@
     private String lng;
     private String lat;
 
-    private String tenantId;
+    private Long tenantId;
     private String name;
     private String deviceType;
     private String openAlarm;
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 59ae646..9404eda 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
@@ -109,7 +109,7 @@
         AlarmLevel alarmLevel = new AlarmLevel();
         alarmLevel.setName(alarmLevelParam.getName());
         alarmLevel.setOpenJob(alarmLevelParam.getOpenJob());
-        alarmLevel.setTenantId(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getTenantId()) ? "-1" : alarmLevelParam.getTenantId()));
+        alarmLevel.setTenantId(alarmLevelParam.getTenantId());
         alarmLevel.setDeviceType(Long.valueOf(StrUtil.isEmpty(alarmLevelParam.getDeviceType()) ? "-1" : alarmLevelParam.getDeviceType()));
         alarmLevel.setHighValue(Float.valueOf(StrUtil.isEmpty(alarmLevelParam.getHighValue()) ? "-1" : alarmLevelParam.getDeviceType()));
         alarmLevel.setLowValue(Float.valueOf(StrUtil.isEmpty(alarmLevelParam.getLowValue()) ? "-1" : alarmLevelParam.getDeviceType()));
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java
index bdae77d..34cf78b 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/controller/AlarmMapOverviewController.java
@@ -49,10 +49,10 @@
      */
     @RequestMapping(value = "/alarmNow")
     @ResponseBody
-    public Object alarmNow() {
+    public Object alarmNow(String alarmType) {
         // 查询当前有效的报警记录（status=1）
         DataScope dataScope = permissionService.getAuthService().getLoginUserDataScope();
-        List<AlarmNowView> alarmNowViewList = alarmNowViewService.getNowAlarmRecords(dataScope);
+        List<AlarmNowView> alarmNowViewList = alarmNowViewService.getNowAlarmRecords(dataScope,alarmType);
         SuccessResponseData successResult = new SuccessResponseData();
         successResult.setData(alarmNowViewList);
         successResult.setMessage("success");
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmNowViewMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmNowViewMapper.java
index a15ffc2..12a476c 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmNowViewMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/AlarmNowViewMapper.java
@@ -18,7 +18,7 @@
  */
 public interface AlarmNowViewMapper extends BaseMapper<AlarmNowView> {
 
-    List<AlarmNowView> getNowAlarmRecords(@Param("scope") DataScope dataScope);
+    List<AlarmNowView> getNowAlarmRecords(@Param("scope") DataScope dataScope,@Param("alarmType")String alarmType);
 
     List<AlarmNowView> getAlarmsByWell(@Param("id") Long id);
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
index 3ce3733..bf7059d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmJobMapper.xml
@@ -559,7 +559,7 @@
 
     <select id="jobListApp" resultType="map">
         SELECT<include refid="job_list_column"/>,
-        (JOB_BELONG_TO = #{userId} OR JOB_BELONG_TO IS NULL) AS editable
+        CASE  WHEN 	JOB_BELONG_TO  <![CDATA[ <> ]]>  #{userId}  THEN  0 ELSE 1 END  AS editable
         FROM alarm_job aj
         LEFT JOIN alarm_records ar ON (aj.ID = ar.JOB_ID AND ar.ID IN ( SELECT MAX(ID) FROM alarm_records GROUP BY
         JOB_ID))
@@ -661,7 +661,7 @@
 
     <select id="jobListDelayReApp" resultType="map">
         SELECT<include refid="job_list_column"/>,
-        (JOB_BELONG_TO = #{userId} OR JOB_BELONG_TO IS NULL) AS editable
+        CASE  WHEN 	JOB_BELONG_TO  <![CDATA[ <> ]]>  #{userId}  THEN  0 ELSE 1 END  AS editable
         FROM alarm_job aj
         LEFT JOIN alarm_records ar ON (aj.ID = ar.JOB_ID AND ar.ID IN ( SELECT MAX(ID) FROM alarm_records GROUP BY
         JOB_ID))
@@ -736,7 +736,7 @@
 
     <select id="jobListDelayProApp" resultType="map">
         SELECT<include refid="job_list_column"/>,
-        (JOB_BELONG_TO = #{userId} OR JOB_BELONG_TO IS NULL) AS editable
+        CASE  WHEN 	JOB_BELONG_TO  <![CDATA[ <> ]]>  #{userId}  THEN  0 ELSE 1 END  AS editable
         FROM alarm_job aj
         LEFT JOIN alarm_records ar ON (aj.ID = ar.JOB_ID AND ar.ID IN ( SELECT MAX(ID) FROM alarm_records GROUP BY
         JOB_ID))
@@ -782,7 +782,7 @@
 
     <select id="jobListSearch" resultType="map">
         SELECT<include refid="job_list_column"/>,
-        (JOB_BELONG_TO = #{userId} OR JOB_BELONG_TO IS NULL) AS editable
+        CASE  WHEN 	JOB_BELONG_TO  <![CDATA[ <> ]]>  #{userId}  THEN  0 ELSE 1 END  AS editable
         FROM alarm_job aj
         LEFT JOIN alarm_records ar ON (aj.ID = ar.JOB_ID AND ar.ID IN ( SELECT MAX(ID) FROM alarm_records GROUP BY
         JOB_ID))
@@ -868,8 +868,9 @@
     </select>
 
     <select id="jobListSearchApp" resultType="map">
-        SELECT<include refid="job_list_column"/>,
-        (JOB_BELONG_TO = #{userId} OR JOB_BELONG_TO IS NULL) AS editable
+        SELECT
+        CASE  WHEN 	JOB_BELONG_TO  <![CDATA[ <> ]]>  #{userId}  THEN  0 ELSE 1 END  AS editable,
+        <include refid="job_list_column"/>
         FROM alarm_job aj
         LEFT JOIN alarm_records ar ON (aj.ID = ar.JOB_ID AND ar.ID IN ( SELECT MAX(ID) FROM alarm_records GROUP BY
         JOB_ID))
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
index 7c45564..bc5063d 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/AlarmNowViewMapper.xml
@@ -19,6 +19,9 @@
         <include refid="Base_Column_List"/>
         FROM alarm_now_view w
         WHERE 1 = 1
+        <if test="alarmType!='' and alarmType!=null">
+            AND alarmtype = #{alarmType}
+        </if>
         ORDER BY alarmTimeDate DESC
     </select>
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IAlarmNowViewService.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IAlarmNowViewService.java
index f851173..218a145 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IAlarmNowViewService.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/IAlarmNowViewService.java
@@ -16,6 +16,6 @@
  */
 public interface IAlarmNowViewService extends IService<AlarmNowView> {
 
-    List<AlarmNowView> getNowAlarmRecords(DataScope dataScope);
+    List<AlarmNowView> getNowAlarmRecords(DataScope dataScope,String alarmType);
     List<AlarmNowView> getAlarmsByWell(Long id);
 }
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmNowViewServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmNowViewServiceImpl.java
index d1e0d38..927dfea 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmNowViewServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/service/impl/AlarmNowViewServiceImpl.java
@@ -26,8 +26,8 @@
     private AbstractDictService dictService;
 
     @Override
-    public List<AlarmNowView> getNowAlarmRecords(DataScope dataScope) {
-        List<AlarmNowView> alarmNowViewList = this.baseMapper.getNowAlarmRecords(dataScope);
+    public List<AlarmNowView> getNowAlarmRecords(DataScope dataScope,String alarmType) {
+        List<AlarmNowView> alarmNowViewList = this.baseMapper.getNowAlarmRecords(dataScope, alarmType);
         for (AlarmNowView alarmNowView : alarmNowViewList) {
             alarmNowView.setWellTypeName(dictService.getDictNameByCode("sluicewellType", alarmNowView.getWellType()));
         }