diff --git a/casic-data/src/main/java/com/casic/missiles/modular/system/controller/DataGasController.java b/casic-data/src/main/java/com/casic/missiles/modular/system/controller/DataGasController.java
index 11f2eb8..a9d96d0 100644
--- a/casic-data/src/main/java/com/casic/missiles/modular/system/controller/DataGasController.java
+++ b/casic-data/src/main/java/com/casic/missiles/modular/system/controller/DataGasController.java
@@ -2,16 +2,20 @@
 
 import cn.hutool.core.lang.Assert;
 import com.casic.missiles.core.base.controller.ExportController;
+import com.casic.missiles.es.DataGasEs;
 import com.casic.missiles.exception.BusinessException;
 import com.casic.missiles.model.exception.enums.CoreExceptionEnum;
 import com.casic.missiles.modular.system.dto.DataGasDTO;
 import com.casic.missiles.modular.system.service.IDataGasService;
+import org.apache.poi.ss.formula.functions.T;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import javax.validation.Valid;
 import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * 甲烷数据控制器
@@ -21,7 +25,7 @@
  */
 @RestController
 @RequestMapping("/data")
-public class DataGasController  extends ExportController {
+public class DataGasController extends ExportController {
 
 
     @Autowired
@@ -31,11 +35,18 @@
      * 获取甲烷数据列表
      */
     @RequestMapping(value = "/hisList")
-    public Object historicalData(@RequestBody @Valid DataGasDTO dataGasDTO,BindingResult bindingResult) throws IOException {
+    public Object historicalData(@RequestBody @Valid DataGasDTO dataGasDTO, BindingResult bindingResult) throws IOException {
         Assert.isFalse(bindingResult.hasErrors(), () -> {
             throw new BusinessException(CoreExceptionEnum.REQUEST_NULL.getCode(), bindingResult.getFieldError().getDefaultMessage());
         });
-        return dataGasService.historicalData(dataGasDTO.getMonitorId(),dataGasDTO.getStartTime(),dataGasDTO.getEndTime());
+        List<T> dataGasList = dataGasService.historicalData(dataGasDTO.getMonitorId(), dataGasDTO.getStartTime(), dataGasDTO.getEndTime());
+        if (dataGasList.size() == 0) {
+            List<DataGasEs> emptyDataList = new ArrayList<>();
+            emptyDataList.add(new DataGasEs());
+            return emptyDataList;
+        } else {
+            return dataGasList;
+        }
     }
 
 }