Merge remote-tracking branch 'remotes/origin/dev_optimize_query' into develop

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StatsResiWarnServiceImpl.java

@@ -206,7 +206,9 @@ public class StatsResiWarnServiceImpl implements StatsResiWarnService {
         Map<String,Map<String, BigDecimal>> tableColumnCountMap = new HashMap<>();
         paramMap.forEach((tableName,columnList) ->{
             Map<String, BigDecimal> countMap = icResiUserDao.getDataAnalyseCount(customerId,tableName,columnList, id,level);
-            tableColumnCountMap.put(tableName,countMap);
+            if (countMap  != null){
+                tableColumnCountMap.put(tableName,countMap);
+            }
         });
         icResiCategoryStatsConfigDTOList.forEach(item->{
             IcStatsResiResultDTO resultDTO = new IcStatsResiResultDTO();