Merge branch 'dev_grid_platform' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/DataReportingServiceImpl.java

@@ -220,8 +220,14 @@ public class DataReportingServiceImpl implements DataReportingService {
 					//如果是对应一级分类，则二级分类为空。如果对应平阴二级分类，则取对应的一级分类
 					CustomerProjectCategoryDictEntity epmetCode = epmetCodeMap.get(code);
 					if (NumConstant.ONE == epmetCode.getLevel()) {
-						categoryCode = null;
 						parentCode = code;
+						//如果项目为一级分类 则二级分类默认给第一个
+						epmetCode = epmetCodeMap.get(code.concat("01"));
+						if (epmetCode == null){
+							log.warn(" 分类下没有子分类，无法拼接2级分类 code:{}",code);
+						} else {
+							categoryCode = epmetCode.getCategoryCode();
+						}
 					} else {
 						categoryCode = code;
 						parentCode = epmetCode.getParentCategoryCode();