From 2ec966f7aab4d048fafaccd1da569e5924626429 Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Mon, 6 Dec 2021 17:39:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A6=82=E6=9E=9C=E9=A1=B9=E7=9B=AE=E5=8F=AA?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E4=BA=86=E4=B8=80=E7=BA=A7=E5=88=86=E7=B1=BB?=
 =?UTF-8?q?=20=E9=BB=98=E8=AE=A4=E7=BB=99=E7=AC=AC=E4=B8=80=E4=B8=AA?=
 =?UTF-8?q?=E4=BA=8C=E7=BA=A7=E5=88=86=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/service/impl/DataReportingServiceImpl.java  | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/DataReportingServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/DataReportingServiceImpl.java
index e3057c2a8e..21a7c06860 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/DataReportingServiceImpl.java
+++ b/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();