Merge remote-tracking branch 'origin/developer' into developer

amos-boot-system-jxiop/amos-boot-module-jxiop-bigscreen-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/EarningsForecastImpl.java

@@ -66,6 +66,9 @@ public class EarningsForecastImpl {
         });
 
         TreeMap<String, Double> map = commonService.getListDataByCondtionsSum(queryCondtion1,objects, ESMoonPowerGeneration.class,null);
+     if (null == map || map.isEmpty() ){
+         return null;
+     }
         TreeMap<String, String> carbonDioxide = new TreeMap<>();
         TreeMap<String, String>  standardCoal = new TreeMap<>();
         TreeMap<String, String>  toner = new TreeMap<>();
@@ -162,6 +165,9 @@ public class EarningsForecastImpl {
         });
 
         TreeMap<String, Double> map = commonService.getListDataByCondtionsSum(queryCondtion1,objects, ESMoonPowerGeneration.class,null);
+        if (null == map || map.isEmpty() ){
+            return null;
+        }
         TreeMap<String, String> carbonDioxide = new TreeMap<>();
         TreeMap<String, String>  standardCoal = new TreeMap<>();
         TreeMap<String, String>  toner = new TreeMap<>();