Merge branch 'dev'

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

@@ -199,7 +199,7 @@ public class DataReportingServiceImpl implements DataReportingService {
 			CustomerProjectCategoryDictEntity categoryEntity = codeMap.get(categoryCode);
 			if (null != categoryEntity) {
 				categoryCode = categoryEntity.getEpmetCategoryCode();
-				parentCode = epmetCodeMap.get(categoryEntity.getEpmetCategoryCode()).getParentCategoryCode();
+				parentCode = null == epmetCodeMap.get(categoryCode)?null:epmetCodeMap.get(categoryCode).getParentCategoryCode();
 			} else {
 				categoryCode = null;
 				parentCode = null;