diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
index a4ca69f..05bb656 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
@@ -190,7 +190,7 @@
         // 设置权属单位、负责人、联系电话
         String deptidStr = wellInfoMap.get("deptid").toString();
         long deptid = StrUtil.isEmpty(deptidStr) ? -1 : Long.valueOf(deptidStr);
-        map.put("deptName", EhcacheConstant.retBean().getDeptNameById(deptid));
+        map.put("deptName", EhcacheConstant.retBean().getSimpleDeptNameById(deptid));
         if (deptid > 0) {
             Long staffstr = EhcacheConstant.retBean().getUserByDept(deptid);
             if (ObjectUtil.isEmpty(staffstr)) {

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
index a4ca69f..05bb656 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
@@ -190,7 +190,7 @@
         // 设置权属单位、负责人、联系电话
         String deptidStr = wellInfoMap.get("deptid").toString();
         long deptid = StrUtil.isEmpty(deptidStr) ? -1 : Long.valueOf(deptidStr);
-        map.put("deptName", EhcacheConstant.retBean().getDeptNameById(deptid));
+        map.put("deptName", EhcacheConstant.retBean().getSimpleDeptNameById(deptid));
         if (deptid > 0) {
             Long staffstr = EhcacheConstant.retBean().getUserByDept(deptid);
             if (ObjectUtil.isEmpty(staffstr)) {
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 cedcccc..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
@@ -73,7 +73,6 @@
 
         // taskId用于在推送时去查找对应的message
         String taskId = push.getContentId(message);
-
         IPushResult ret = push.pushMessageToList(taskId, targets);
         System.out.println(ret.getResponse().toString());
         return  ret;

diff --git a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
index a4ca69f..05bb656 100644
--- a/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
+++ b/casic-alarm/src/main/java/com/casic/missiles/modular/alarm/controller/AlarmJobController.java
@@ -190,7 +190,7 @@
         // 设置权属单位、负责人、联系电话
         String deptidStr = wellInfoMap.get("deptid").toString();
         long deptid = StrUtil.isEmpty(deptidStr) ? -1 : Long.valueOf(deptidStr);
-        map.put("deptName", EhcacheConstant.retBean().getDeptNameById(deptid));
+        map.put("deptName", EhcacheConstant.retBean().getSimpleDeptNameById(deptid));
         if (deptid > 0) {
             Long staffstr = EhcacheConstant.retBean().getUserByDept(deptid);
             if (ObjectUtil.isEmpty(staffstr)) {
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 cedcccc..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
@@ -73,7 +73,6 @@
 
         // taskId用于在推送时去查找对应的message
         String taskId = push.getContentId(message);
-
         IPushResult ret = push.pushMessageToList(taskId, targets);
         System.out.println(ret.getResponse().toString());
         return  ret;
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
index 69d6d69..8a494a9 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/controller/DeviceWellDataController.java
@@ -79,6 +79,7 @@
             deviceDto.setDeptName(permissionService.getDeptService().getDeptName(deviceDto.getDeptid()));
         });
         super.exportExcel(WellCoverDataDto.class, wellCoverDataDtoList, DeviceExportEnum.WELLDATA_EXPORT.getFileName());
+
     }
 
     /**
@@ -120,7 +121,6 @@
     @GetMapping(value = "/liquiddata/export")
     @Permission
     public void liquidDataExport(HttpServletResponse response, String keywords, String deptid, String beginTime, String endTime) throws IOException {
-
         Page<DeviceDataExcelDto> page = PageFactory.defaultPage();
         page.setCurrent(1);
         page.setSearchCount(false);