diff --git a/psdc-business/src/main/resources/mapper/business/PsdcElectricHtdataMapper.xml b/psdc-business/src/main/resources/mapper/business/PsdcElectricHtdataMapper.xml
index 238638e..f1359b9 100644
--- a/psdc-business/src/main/resources/mapper/business/PsdcElectricHtdataMapper.xml
+++ b/psdc-business/src/main/resources/mapper/business/PsdcElectricHtdataMapper.xml
@@ -88,7 +88,7 @@
 
 
     <select id="selTodayUseEnergy" resultType="java.lang.Double">
-        Select SUM(use_deiffen) From psdc_electric_htdata
+        Select NULLIF(SUM(use_deiffen), 0.0) From psdc_electric_htdata
         <where>
             <if test="deviceId != null and deviceId != ''">
                 device_id = #{deviceId}
diff --git a/psdc-web/src/main/java/com/psdc/controller/monitor/TotalElectricMeterController.java b/psdc-web/src/main/java/com/psdc/controller/monitor/TotalElectricMeterController.java
index 1eab891..dbb823d 100644
--- a/psdc-web/src/main/java/com/psdc/controller/monitor/TotalElectricMeterController.java
+++ b/psdc-web/src/main/java/com/psdc/controller/monitor/TotalElectricMeterController.java
@@ -56,11 +56,16 @@ public class TotalElectricMeterController {
     @RequestMapping(value = "/sel1/{deviceId}", method = RequestMethod.GET)
     public AjaxResult selzdb1(@PathVariable(value = "deviceId", required = false) Integer deviceId)  {
         PsdcDevicePowerRes devicePowerRes = psdcThermometerHtdataService.selTotalElectricityInfo(deviceId);
-        Map map = psdcElectricHtdataService.selTotalElectricityInfo();
-        devicePowerRes.setEDay((Double) map.get("eday"));
-        devicePowerRes.setEMonth((Double) map.get("emonth"));
-        AjaxResult ajax = AjaxResult.success(devicePowerRes);
-        return ajax;
+        if (null != devicePowerRes){
+            Map map = psdcElectricHtdataService.selTotalElectricityInfo();
+            devicePowerRes.setEDay((Double) map.get("eday"));
+            devicePowerRes.setEMonth((Double) map.get("emonth"));
+            AjaxResult ajax = AjaxResult.success(devicePowerRes);
+            return ajax;
+        } else {
+            return AjaxResult.success("该设备今日暂无数据！");
+        }
+
     }
 
     @PreAuthorize("@ss.hasPermi('emonitor:db')")