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 e7e1fae..bf9a8ab 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
@@ -173,7 +173,7 @@
     private void alarmJobWrapper(Map<String, Object> map) {
         // 设置人员姓名
         for (String key : map.keySet()) {
-            if (key.contains("jobPerson") || key.contains("jobBelongTo")) {
+            if (key.contains("getJobPerson") || key.contains("jobBelongTo")) {
                 Object object = map.get(key);
                 if (object != null) {
                     String newVal = EhcacheConstant.retBean().getUsernameById(Long.parseLong(String.valueOf(object)));

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 e7e1fae..bf9a8ab 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
@@ -173,7 +173,7 @@
     private void alarmJobWrapper(Map<String, Object> map) {
         // 设置人员姓名
         for (String key : map.keySet()) {
-            if (key.contains("jobPerson") || key.contains("jobBelongTo")) {
+            if (key.contains("getJobPerson") || key.contains("jobBelongTo")) {
                 Object object = map.get(key);
                 if (object != null) {
                     String newVal = EhcacheConstant.retBean().getUsernameById(Long.parseLong(String.valueOf(object)));
diff --git a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java
index dd59ab7..cdbe4d9 100644
--- a/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java
+++ b/casic-data-analysis/src/main/java/com/casic/missiles/modular/system/service/impl/ThirdPartyDataServiceImpl.java
@@ -136,7 +136,7 @@
             String tableName = DeviceDataTableEnum.DEVICE_TYPE_TABLE.getTableNameMap().
                     get(typeId).getTableName();
             Map<String, Object> recordCounts = thirdPartyMapper.countRecordsByTime(dataScope, beginTime, endTime, tableName);
-            countRecords.put("countRecords", recordCounts.get("recodCounts") == null ? "" : recordCounts.get("recodCounts").toString());
+            countRecords.put("countRecords",recordCounts==null || recordCounts.get("recodCounts") == null ? "0": recordCounts.get("recodCounts").toString());
             countRecords.put("deviceName", DeviceDataTableEnum.DEVICE_TYPE_TABLE.getTableNameMap().
                     get(Integer.valueOf(deviceType.toString())).getTypeName());
             countRecordList.add(countRecords);