diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/cockpit/CustomerBusinessServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/cockpit/CustomerBusinessServiceImpl.java
index 6691348..5986391 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/cockpit/CustomerBusinessServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/cockpit/CustomerBusinessServiceImpl.java
@@ -101,7 +101,7 @@
                 ManageTrendResponse trendResponse = new ManageTrendResponse();
                 trendResponse.setDimension(date);
                 trendResponse.setAmount(0);
-                list.add(trendResponse);
+                finalList.add(trendResponse);
             }
         }else{
             for (String date : dateList) {

diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/cockpit/CustomerBusinessServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/cockpit/CustomerBusinessServiceImpl.java
index 6691348..5986391 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/cockpit/CustomerBusinessServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/cockpit/CustomerBusinessServiceImpl.java
@@ -101,7 +101,7 @@
                 ManageTrendResponse trendResponse = new ManageTrendResponse();
                 trendResponse.setDimension(date);
                 trendResponse.setAmount(0);
-                list.add(trendResponse);
+                finalList.add(trendResponse);
             }
         }else{
             for (String date : dateList) {
diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/cockpit/MeasureTaskServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/cockpit/MeasureTaskServiceImpl.java
index 71fe302..cd7484b 100644
--- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/cockpit/MeasureTaskServiceImpl.java
+++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/cockpit/MeasureTaskServiceImpl.java
@@ -254,10 +254,11 @@
         request.setEndTime(DateUtil.now());
         BoardDeptOutputListResponse response = boardService.deptOutputList(request);
         List<BoardDeptOutputResponse> list = response.getList();
+
+        QueryWrapper<MeterStaff> wrapper = new QueryWrapper<>();
+        wrapper.eq("is_del", 0);
+        List<MeterStaff> meterStaffs = meterStaffMapper.selectList(wrapper);
         if(CollectionUtils.isEmpty(list)){
-            QueryWrapper<MeterStaff> wrapper = new QueryWrapper<>();
-            wrapper.eq("is_del", 0);
-            List<MeterStaff> meterStaffs = meterStaffMapper.selectList(wrapper);
             List<StaffAnalyseListResponse> lists = new ArrayList<>();
             meterStaffs.forEach(staff -> {
                 StaffAnalyseListResponse staffAnalyseListResponse = new StaffAnalyseListResponse();
@@ -268,6 +269,15 @@
             return lists;
         }
         List<StaffAnalyseListResponse> resultList = ConvertUtils.sourceToTarget(list, StaffAnalyseListResponse.class);
+        List<Long> collect = resultList.stream().map(StaffAnalyseListResponse::getStaffId).collect(Collectors.toList());
+        meterStaffs.forEach(staff -> {
+            if(collect.contains(staff.getId())){
+                StaffAnalyseListResponse dto = new StaffAnalyseListResponse();
+                dto.setStaffId(staff.getId());
+                dto.setStaffName(staff.getName());
+                resultList.add(dto);
+            }
+        });
         return resultList;
     }
 }