Merge remote-tracking branch 'origin/dev_screen_data_2.0' into dev_screen_data_2.0

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/IndexServiceImpl.java

@@ -270,6 +270,9 @@ public class IndexServiceImpl implements IndexService {
         //screen_index_data_monthly 根据组织id和月份获取月度指标得分
         //1.根据组织或网格Id以及月份Id查询各项月度指数得分
         IndexScoreResultDTO resultDTO = screenIndexDataMonthlyDao.selectMonthData(formDTO);
+        if (null == resultDTO) {
+            return resultDTO;
+        }
 
         //2.将数据改成正确格式 四舍五入保留一位小数  权重转成百分比
         NumberFormat nf = NumberFormat.getPercentInstance();