diff --git a/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java b/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java
index 019db17..0d30c7b 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java
@@ -3,12 +3,14 @@
 import cn.hutool.core.util.StrUtil;
 import com.casic.missiles.modular.system.dao.AlarmRuleMapper;
 import com.casic.missiles.modular.system.dao.SysDictMapper;
+import com.casic.missiles.modular.system.model.User;
 import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.context.annotation.DependsOn;
 import org.springframework.stereotype.Component;
 
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 @Component
@@ -33,6 +35,12 @@
     {
         return sysDictMapper.getDeptNameById(deptid);
     }
+
+    @Cacheable(value = "CONSTANT", key = "'UserList-'+#deptid")
+    public List<User> getUserByDeptId(long deptid)
+    {
+        return sysDictMapper.getUserByDeptId(deptid);
+    }
     @Cacheable(value = "CONSTANT", key = "'simpleDeptName-'+#deptid")
     public String getSimpleDeptNameById(long deptid)
     {

diff --git a/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java b/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java
index 019db17..0d30c7b 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java
@@ -3,12 +3,14 @@
 import cn.hutool.core.util.StrUtil;
 import com.casic.missiles.modular.system.dao.AlarmRuleMapper;
 import com.casic.missiles.modular.system.dao.SysDictMapper;
+import com.casic.missiles.modular.system.model.User;
 import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.context.annotation.DependsOn;
 import org.springframework.stereotype.Component;
 
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 @Component
@@ -33,6 +35,12 @@
     {
         return sysDictMapper.getDeptNameById(deptid);
     }
+
+    @Cacheable(value = "CONSTANT", key = "'UserList-'+#deptid")
+    public List<User> getUserByDeptId(long deptid)
+    {
+        return sysDictMapper.getUserByDeptId(deptid);
+    }
     @Cacheable(value = "CONSTANT", key = "'simpleDeptName-'+#deptid")
     public String getSimpleDeptNameById(long deptid)
     {
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
index 4e9d17c..0725980 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
@@ -3,12 +3,14 @@
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
+import com.alibaba.druid.util.StringUtils;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 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.application.enums.UserQueryEnum;
+import com.casic.missiles.core.application.service.AbstractUserService;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.modular.alarm.job.DelayJob;
@@ -59,7 +61,7 @@
     private String sMember;
     @Value("${smartcity.appRoleName}")
     private String sApp;
-    @Value("${smartcity.useOverTime")
+    @Value("${smartcity.useOverTime}")
     private String useOverTime;
 
     @Resource
@@ -325,9 +327,11 @@
             }
         }
 
-        if (!("null".equals(id))) {
-            AlarmJob alarmJob = this.baseMapper.selectById(id);
-            sendJob(id, alarmJob, userClientViewList);//推送工单至app和pc端
+        if (!(StrUtil.isEmpty(id))) {
+            AlarmJob alarmJob = this.baseMapper.selectById(Long.valueOf(id));
+            if (alarmJob != null) {
+                sendJob(id, alarmJob, userClientViewList);//推送工单至app和pc端
+            }
         }
         if (StrUtil.isNotBlank(msg)) {
             sendAlarm(msg, userClientViewList);//推送告警至app和pc端
@@ -359,9 +363,7 @@
         }
         // PC推送,推给信息办
         // List<User> userList = permissionService.getRoleUsersByTips("1178242562491285506",null,false);
-        QueryWrapper wrapper = new QueryWrapper();
-        wrapper.eq(UserQueryEnum.DEPT_ID, "1178242562491285506");
-        List<User> userList = iCommonUserService.getUserService().list(wrapper);
+        List<User> userList = EhcacheConstant.retBean().getUserByDeptId(Long.valueOf("1178242562491285506"));
         for (User user : userList) {
             userIds.add(user.getId().toString());
         }
@@ -417,7 +419,6 @@
             quartzManager.addJob(jobName, HandleAlarmJob.class, shouldHandleTime, map);
             alarmJob.setShouldGetTime(shouldHandleTime);
         }
-
         this.baseMapper.updateById(alarmJob);
     }
 

diff --git a/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java b/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java
index 019db17..0d30c7b 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java
@@ -3,12 +3,14 @@
 import cn.hutool.core.util.StrUtil;
 import com.casic.missiles.modular.system.dao.AlarmRuleMapper;
 import com.casic.missiles.modular.system.dao.SysDictMapper;
+import com.casic.missiles.modular.system.model.User;
 import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.context.annotation.DependsOn;
 import org.springframework.stereotype.Component;
 
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 @Component
@@ -33,6 +35,12 @@
     {
         return sysDictMapper.getDeptNameById(deptid);
     }
+
+    @Cacheable(value = "CONSTANT", key = "'UserList-'+#deptid")
+    public List<User> getUserByDeptId(long deptid)
+    {
+        return sysDictMapper.getUserByDeptId(deptid);
+    }
     @Cacheable(value = "CONSTANT", key = "'simpleDeptName-'+#deptid")
     public String getSimpleDeptNameById(long deptid)
     {
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
index 4e9d17c..0725980 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
@@ -3,12 +3,14 @@
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
+import com.alibaba.druid.util.StringUtils;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 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.application.enums.UserQueryEnum;
+import com.casic.missiles.core.application.service.AbstractUserService;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.modular.alarm.job.DelayJob;
@@ -59,7 +61,7 @@
     private String sMember;
     @Value("${smartcity.appRoleName}")
     private String sApp;
-    @Value("${smartcity.useOverTime")
+    @Value("${smartcity.useOverTime}")
     private String useOverTime;
 
     @Resource
@@ -325,9 +327,11 @@
             }
         }
 
-        if (!("null".equals(id))) {
-            AlarmJob alarmJob = this.baseMapper.selectById(id);
-            sendJob(id, alarmJob, userClientViewList);//推送工单至app和pc端
+        if (!(StrUtil.isEmpty(id))) {
+            AlarmJob alarmJob = this.baseMapper.selectById(Long.valueOf(id));
+            if (alarmJob != null) {
+                sendJob(id, alarmJob, userClientViewList);//推送工单至app和pc端
+            }
         }
         if (StrUtil.isNotBlank(msg)) {
             sendAlarm(msg, userClientViewList);//推送告警至app和pc端
@@ -359,9 +363,7 @@
         }
         // PC推送,推给信息办
         // List<User> userList = permissionService.getRoleUsersByTips("1178242562491285506",null,false);
-        QueryWrapper wrapper = new QueryWrapper();
-        wrapper.eq(UserQueryEnum.DEPT_ID, "1178242562491285506");
-        List<User> userList = iCommonUserService.getUserService().list(wrapper);
+        List<User> userList = EhcacheConstant.retBean().getUserByDeptId(Long.valueOf("1178242562491285506"));
         for (User user : userList) {
             userIds.add(user.getId().toString());
         }
@@ -417,7 +419,6 @@
             quartzManager.addJob(jobName, HandleAlarmJob.class, shouldHandleTime, map);
             alarmJob.setShouldGetTime(shouldHandleTime);
         }
-
         this.baseMapper.updateById(alarmJob);
     }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
index abd0e1d..21119fb 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.model.SysDict;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.model.User;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -30,6 +31,8 @@
 
     String getDeptNameById(@Param("deptid") long deptid);
 
+    List<User> getUserByDeptId(@Param("deptid") long deptid);
+
     String getSimpleDeptNameById(@Param("deptid") long deptid);
 
     String getAlarmTypeNameByCodeNum(@Param("alarmType") String alarmType);

diff --git a/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java b/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java
index 019db17..0d30c7b 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java
@@ -3,12 +3,14 @@
 import cn.hutool.core.util.StrUtil;
 import com.casic.missiles.modular.system.dao.AlarmRuleMapper;
 import com.casic.missiles.modular.system.dao.SysDictMapper;
+import com.casic.missiles.modular.system.model.User;
 import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.context.annotation.DependsOn;
 import org.springframework.stereotype.Component;
 
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 @Component
@@ -33,6 +35,12 @@
     {
         return sysDictMapper.getDeptNameById(deptid);
     }
+
+    @Cacheable(value = "CONSTANT", key = "'UserList-'+#deptid")
+    public List<User> getUserByDeptId(long deptid)
+    {
+        return sysDictMapper.getUserByDeptId(deptid);
+    }
     @Cacheable(value = "CONSTANT", key = "'simpleDeptName-'+#deptid")
     public String getSimpleDeptNameById(long deptid)
     {
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
index 4e9d17c..0725980 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
@@ -3,12 +3,14 @@
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
+import com.alibaba.druid.util.StringUtils;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 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.application.enums.UserQueryEnum;
+import com.casic.missiles.core.application.service.AbstractUserService;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.modular.alarm.job.DelayJob;
@@ -59,7 +61,7 @@
     private String sMember;
     @Value("${smartcity.appRoleName}")
     private String sApp;
-    @Value("${smartcity.useOverTime")
+    @Value("${smartcity.useOverTime}")
     private String useOverTime;
 
     @Resource
@@ -325,9 +327,11 @@
             }
         }
 
-        if (!("null".equals(id))) {
-            AlarmJob alarmJob = this.baseMapper.selectById(id);
-            sendJob(id, alarmJob, userClientViewList);//推送工单至app和pc端
+        if (!(StrUtil.isEmpty(id))) {
+            AlarmJob alarmJob = this.baseMapper.selectById(Long.valueOf(id));
+            if (alarmJob != null) {
+                sendJob(id, alarmJob, userClientViewList);//推送工单至app和pc端
+            }
         }
         if (StrUtil.isNotBlank(msg)) {
             sendAlarm(msg, userClientViewList);//推送告警至app和pc端
@@ -359,9 +363,7 @@
         }
         // PC推送,推给信息办
         // List<User> userList = permissionService.getRoleUsersByTips("1178242562491285506",null,false);
-        QueryWrapper wrapper = new QueryWrapper();
-        wrapper.eq(UserQueryEnum.DEPT_ID, "1178242562491285506");
-        List<User> userList = iCommonUserService.getUserService().list(wrapper);
+        List<User> userList = EhcacheConstant.retBean().getUserByDeptId(Long.valueOf("1178242562491285506"));
         for (User user : userList) {
             userIds.add(user.getId().toString());
         }
@@ -417,7 +419,6 @@
             quartzManager.addJob(jobName, HandleAlarmJob.class, shouldHandleTime, map);
             alarmJob.setShouldGetTime(shouldHandleTime);
         }
-
         this.baseMapper.updateById(alarmJob);
     }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
index abd0e1d..21119fb 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.model.SysDict;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.model.User;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -30,6 +31,8 @@
 
     String getDeptNameById(@Param("deptid") long deptid);
 
+    List<User> getUserByDeptId(@Param("deptid") long deptid);
+
     String getSimpleDeptNameById(@Param("deptid") long deptid);
 
     String getAlarmTypeNameByCodeNum(@Param("alarmType") String alarmType);
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 30c41a1..99aeeb9 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
@@ -1143,7 +1143,8 @@
         WHERE USERID = #{userId}
     </select>
     <select id="selectRoles" resultType="com.casic.missiles.modular.system.dto.SelectDto">
-     SELECT id,sr.`dataScope` AS name FROM sys_role sr
+     SELECT id,sr.dataScope AS name
+     FROM sys_role sr
     </select>
     <select id="selectUseIds" resultType="Long">
 

diff --git a/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java b/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java
index 019db17..0d30c7b 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java
@@ -3,12 +3,14 @@
 import cn.hutool.core.util.StrUtil;
 import com.casic.missiles.modular.system.dao.AlarmRuleMapper;
 import com.casic.missiles.modular.system.dao.SysDictMapper;
+import com.casic.missiles.modular.system.model.User;
 import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.context.annotation.DependsOn;
 import org.springframework.stereotype.Component;
 
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 @Component
@@ -33,6 +35,12 @@
     {
         return sysDictMapper.getDeptNameById(deptid);
     }
+
+    @Cacheable(value = "CONSTANT", key = "'UserList-'+#deptid")
+    public List<User> getUserByDeptId(long deptid)
+    {
+        return sysDictMapper.getUserByDeptId(deptid);
+    }
     @Cacheable(value = "CONSTANT", key = "'simpleDeptName-'+#deptid")
     public String getSimpleDeptNameById(long deptid)
     {
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
index 4e9d17c..0725980 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
@@ -3,12 +3,14 @@
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
+import com.alibaba.druid.util.StringUtils;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 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.application.enums.UserQueryEnum;
+import com.casic.missiles.core.application.service.AbstractUserService;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.modular.alarm.job.DelayJob;
@@ -59,7 +61,7 @@
     private String sMember;
     @Value("${smartcity.appRoleName}")
     private String sApp;
-    @Value("${smartcity.useOverTime")
+    @Value("${smartcity.useOverTime}")
     private String useOverTime;
 
     @Resource
@@ -325,9 +327,11 @@
             }
         }
 
-        if (!("null".equals(id))) {
-            AlarmJob alarmJob = this.baseMapper.selectById(id);
-            sendJob(id, alarmJob, userClientViewList);//推送工单至app和pc端
+        if (!(StrUtil.isEmpty(id))) {
+            AlarmJob alarmJob = this.baseMapper.selectById(Long.valueOf(id));
+            if (alarmJob != null) {
+                sendJob(id, alarmJob, userClientViewList);//推送工单至app和pc端
+            }
         }
         if (StrUtil.isNotBlank(msg)) {
             sendAlarm(msg, userClientViewList);//推送告警至app和pc端
@@ -359,9 +363,7 @@
         }
         // PC推送,推给信息办
         // List<User> userList = permissionService.getRoleUsersByTips("1178242562491285506",null,false);
-        QueryWrapper wrapper = new QueryWrapper();
-        wrapper.eq(UserQueryEnum.DEPT_ID, "1178242562491285506");
-        List<User> userList = iCommonUserService.getUserService().list(wrapper);
+        List<User> userList = EhcacheConstant.retBean().getUserByDeptId(Long.valueOf("1178242562491285506"));
         for (User user : userList) {
             userIds.add(user.getId().toString());
         }
@@ -417,7 +419,6 @@
             quartzManager.addJob(jobName, HandleAlarmJob.class, shouldHandleTime, map);
             alarmJob.setShouldGetTime(shouldHandleTime);
         }
-
         this.baseMapper.updateById(alarmJob);
     }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
index abd0e1d..21119fb 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.model.SysDict;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.model.User;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -30,6 +31,8 @@
 
     String getDeptNameById(@Param("deptid") long deptid);
 
+    List<User> getUserByDeptId(@Param("deptid") long deptid);
+
     String getSimpleDeptNameById(@Param("deptid") long deptid);
 
     String getAlarmTypeNameByCodeNum(@Param("alarmType") String alarmType);
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 30c41a1..99aeeb9 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
@@ -1143,7 +1143,8 @@
         WHERE USERID = #{userId}
     </select>
     <select id="selectRoles" resultType="com.casic.missiles.modular.system.dto.SelectDto">
-     SELECT id,sr.`dataScope` AS name FROM sys_role sr
+     SELECT id,sr.dataScope AS name
+     FROM sys_role sr
     </select>
     <select id="selectUseIds" resultType="Long">
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index 3ef13f6..9419c23 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -13,7 +13,7 @@
         SELECT
             A.wellCount ,
             A.deptid,
-            SD.simplename as "deptName",
+            SD.simple_name as "deptName",
             SD.pid
         FROM
         ( SELECT COUNT( 1 ) AS wellCount, DEPTID AS deptid FROM bus_well_info WHERE VALID = '1' GROUP BY DEPTID ) A

diff --git a/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java b/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java
index 019db17..0d30c7b 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java
@@ -3,12 +3,14 @@
 import cn.hutool.core.util.StrUtil;
 import com.casic.missiles.modular.system.dao.AlarmRuleMapper;
 import com.casic.missiles.modular.system.dao.SysDictMapper;
+import com.casic.missiles.modular.system.model.User;
 import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.context.annotation.DependsOn;
 import org.springframework.stereotype.Component;
 
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 @Component
@@ -33,6 +35,12 @@
     {
         return sysDictMapper.getDeptNameById(deptid);
     }
+
+    @Cacheable(value = "CONSTANT", key = "'UserList-'+#deptid")
+    public List<User> getUserByDeptId(long deptid)
+    {
+        return sysDictMapper.getUserByDeptId(deptid);
+    }
     @Cacheable(value = "CONSTANT", key = "'simpleDeptName-'+#deptid")
     public String getSimpleDeptNameById(long deptid)
     {
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
index 4e9d17c..0725980 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
@@ -3,12 +3,14 @@
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
+import com.alibaba.druid.util.StringUtils;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 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.application.enums.UserQueryEnum;
+import com.casic.missiles.core.application.service.AbstractUserService;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.modular.alarm.job.DelayJob;
@@ -59,7 +61,7 @@
     private String sMember;
     @Value("${smartcity.appRoleName}")
     private String sApp;
-    @Value("${smartcity.useOverTime")
+    @Value("${smartcity.useOverTime}")
     private String useOverTime;
 
     @Resource
@@ -325,9 +327,11 @@
             }
         }
 
-        if (!("null".equals(id))) {
-            AlarmJob alarmJob = this.baseMapper.selectById(id);
-            sendJob(id, alarmJob, userClientViewList);//推送工单至app和pc端
+        if (!(StrUtil.isEmpty(id))) {
+            AlarmJob alarmJob = this.baseMapper.selectById(Long.valueOf(id));
+            if (alarmJob != null) {
+                sendJob(id, alarmJob, userClientViewList);//推送工单至app和pc端
+            }
         }
         if (StrUtil.isNotBlank(msg)) {
             sendAlarm(msg, userClientViewList);//推送告警至app和pc端
@@ -359,9 +363,7 @@
         }
         // PC推送,推给信息办
         // List<User> userList = permissionService.getRoleUsersByTips("1178242562491285506",null,false);
-        QueryWrapper wrapper = new QueryWrapper();
-        wrapper.eq(UserQueryEnum.DEPT_ID, "1178242562491285506");
-        List<User> userList = iCommonUserService.getUserService().list(wrapper);
+        List<User> userList = EhcacheConstant.retBean().getUserByDeptId(Long.valueOf("1178242562491285506"));
         for (User user : userList) {
             userIds.add(user.getId().toString());
         }
@@ -417,7 +419,6 @@
             quartzManager.addJob(jobName, HandleAlarmJob.class, shouldHandleTime, map);
             alarmJob.setShouldGetTime(shouldHandleTime);
         }
-
         this.baseMapper.updateById(alarmJob);
     }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
index abd0e1d..21119fb 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.model.SysDict;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.model.User;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -30,6 +31,8 @@
 
     String getDeptNameById(@Param("deptid") long deptid);
 
+    List<User> getUserByDeptId(@Param("deptid") long deptid);
+
     String getSimpleDeptNameById(@Param("deptid") long deptid);
 
     String getAlarmTypeNameByCodeNum(@Param("alarmType") String alarmType);
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 30c41a1..99aeeb9 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
@@ -1143,7 +1143,8 @@
         WHERE USERID = #{userId}
     </select>
     <select id="selectRoles" resultType="com.casic.missiles.modular.system.dto.SelectDto">
-     SELECT id,sr.`dataScope` AS name FROM sys_role sr
+     SELECT id,sr.dataScope AS name
+     FROM sys_role sr
     </select>
     <select id="selectUseIds" resultType="Long">
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index 3ef13f6..9419c23 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -13,7 +13,7 @@
         SELECT
             A.wellCount ,
             A.deptid,
-            SD.simplename as "deptName",
+            SD.simple_name as "deptName",
             SD.pid
         FROM
         ( SELECT COUNT( 1 ) AS wellCount, DEPTID AS deptid FROM bus_well_info WHERE VALID = '1' GROUP BY DEPTID ) A
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
index 444a7eb..5b43751 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
@@ -86,6 +86,12 @@
         select FULL_NAME as "deptName" from sys_dept where id =#{deptid};
     </select>
 
+    <select id="getUserByDeptId" resultType="String">
+        select *
+        from sys_user
+        where dept_id =#{deptid};
+    </select>
+
     <select id="getSimpleDeptNameById" resultType="String">
         select SIMPLE_NAME as "deptName" from sys_dept where id =#{deptid};
     </select>

diff --git a/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java b/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java
index 019db17..0d30c7b 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/core/util/EhcacheConstant.java
@@ -3,12 +3,14 @@
 import cn.hutool.core.util.StrUtil;
 import com.casic.missiles.modular.system.dao.AlarmRuleMapper;
 import com.casic.missiles.modular.system.dao.SysDictMapper;
+import com.casic.missiles.modular.system.model.User;
 import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.context.annotation.DependsOn;
 import org.springframework.stereotype.Component;
 
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 @Component
@@ -33,6 +35,12 @@
     {
         return sysDictMapper.getDeptNameById(deptid);
     }
+
+    @Cacheable(value = "CONSTANT", key = "'UserList-'+#deptid")
+    public List<User> getUserByDeptId(long deptid)
+    {
+        return sysDictMapper.getUserByDeptId(deptid);
+    }
     @Cacheable(value = "CONSTANT", key = "'simpleDeptName-'+#deptid")
     public String getSimpleDeptNameById(long deptid)
     {
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
index 4e9d17c..0725980 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/service/impl/AlarmJobServiceImpl.java
@@ -3,12 +3,14 @@
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
+import com.alibaba.druid.util.StringUtils;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 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.application.enums.UserQueryEnum;
+import com.casic.missiles.core.application.service.AbstractUserService;
 import com.casic.missiles.core.datascope.DataScope;
 import com.casic.missiles.core.util.EhcacheConstant;
 import com.casic.missiles.modular.alarm.job.DelayJob;
@@ -59,7 +61,7 @@
     private String sMember;
     @Value("${smartcity.appRoleName}")
     private String sApp;
-    @Value("${smartcity.useOverTime")
+    @Value("${smartcity.useOverTime}")
     private String useOverTime;
 
     @Resource
@@ -325,9 +327,11 @@
             }
         }
 
-        if (!("null".equals(id))) {
-            AlarmJob alarmJob = this.baseMapper.selectById(id);
-            sendJob(id, alarmJob, userClientViewList);//推送工单至app和pc端
+        if (!(StrUtil.isEmpty(id))) {
+            AlarmJob alarmJob = this.baseMapper.selectById(Long.valueOf(id));
+            if (alarmJob != null) {
+                sendJob(id, alarmJob, userClientViewList);//推送工单至app和pc端
+            }
         }
         if (StrUtil.isNotBlank(msg)) {
             sendAlarm(msg, userClientViewList);//推送告警至app和pc端
@@ -359,9 +363,7 @@
         }
         // PC推送,推给信息办
         // List<User> userList = permissionService.getRoleUsersByTips("1178242562491285506",null,false);
-        QueryWrapper wrapper = new QueryWrapper();
-        wrapper.eq(UserQueryEnum.DEPT_ID, "1178242562491285506");
-        List<User> userList = iCommonUserService.getUserService().list(wrapper);
+        List<User> userList = EhcacheConstant.retBean().getUserByDeptId(Long.valueOf("1178242562491285506"));
         for (User user : userList) {
             userIds.add(user.getId().toString());
         }
@@ -417,7 +419,6 @@
             quartzManager.addJob(jobName, HandleAlarmJob.class, shouldHandleTime, map);
             alarmJob.setShouldGetTime(shouldHandleTime);
         }
-
         this.baseMapper.updateById(alarmJob);
     }
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
index abd0e1d..21119fb 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/SysDictMapper.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.casic.missiles.modular.system.model.SysDict;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.casic.missiles.modular.system.model.User;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -30,6 +31,8 @@
 
     String getDeptNameById(@Param("deptid") long deptid);
 
+    List<User> getUserByDeptId(@Param("deptid") long deptid);
+
     String getSimpleDeptNameById(@Param("deptid") long deptid);
 
     String getAlarmTypeNameByCodeNum(@Param("alarmType") String alarmType);
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 30c41a1..99aeeb9 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
@@ -1143,7 +1143,8 @@
         WHERE USERID = #{userId}
     </select>
     <select id="selectRoles" resultType="com.casic.missiles.modular.system.dto.SelectDto">
-     SELECT id,sr.`dataScope` AS name FROM sys_role sr
+     SELECT id,sr.dataScope AS name
+     FROM sys_role sr
     </select>
     <select id="selectUseIds" resultType="Long">
 
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
index 3ef13f6..9419c23 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/StatisticMapper.xml
@@ -13,7 +13,7 @@
         SELECT
             A.wellCount ,
             A.deptid,
-            SD.simplename as "deptName",
+            SD.simple_name as "deptName",
             SD.pid
         FROM
         ( SELECT COUNT( 1 ) AS wellCount, DEPTID AS deptid FROM bus_well_info WHERE VALID = '1' GROUP BY DEPTID ) A
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
index 444a7eb..5b43751 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/dao/mapping/SysDictMapper.xml
@@ -86,6 +86,12 @@
         select FULL_NAME as "deptName" from sys_dept where id =#{deptid};
     </select>
 
+    <select id="getUserByDeptId" resultType="String">
+        select *
+        from sys_user
+        where dept_id =#{deptid};
+    </select>
+
     <select id="getSimpleDeptNameById" resultType="String">
         select SIMPLE_NAME as "deptName" from sys_dept where id =#{deptid};
     </select>
diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/system/util/PushList.java b/casic-alarm/src/main/java/com/casic/missiles/modular/system/util/PushList.java
index 81ed390..83521c7 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/system/util/PushList.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/system/util/PushList.java
@@ -20,7 +20,7 @@
 
 @Component
 public class PushList {
-    //采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换;
+//    采用"Java SDK 快速入门"， "第二步 获取访问凭证 "中获得的应用配置，用户可以自行替换;
 
 //    private static String appId = Configure.getProperty("gt.appId","qQqFtTBrUa7SGLjntUlpT4");
 //    private static String appKey = Configure.getProperty("gt.appKey","GNjHLiqJkD6OoeZbtbdfi5");