From ebe64c6f8d5bf2e6aa10617aa1eebfed87a00668 Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrjt@163.com>
Date: Tue, 23 Nov 2021 17:48:00 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=8F=90=E5=8F=96=E5=88=86?=
 =?UTF-8?q?=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../screen/impl/ScreenProjectDataServiceImpl.java    | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectDataServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectDataServiceImpl.java
index d8e591ea31..fcdcf05349 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectDataServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ScreenProjectDataServiceImpl.java
@@ -163,7 +163,7 @@ public class ScreenProjectDataServiceImpl extends BaseServiceImpl<ScreenProjectD
         baseDao.deleteByProjectId(param.getCustomerId(), item.getProjectId());
         screenProjectImgDataDao.deleteByProjectId(param.getCustomerId(), item.getProjectId());
         baseDao.insert(screenProjectDataEntity);
-        saveCategory(param.getCustomerId(), Collections.singletonList(screenProjectDataEntity))
+        saveCategory(param.getCustomerId(), Collections.singletonList(screenProjectDataEntity));
         //插入该项目图片表
         String[] projectImgUrl = item.getProjectImgUrl();
         if (ArrayUtils.isNotEmpty(projectImgUrl)) {
@@ -174,7 +174,7 @@ public class ScreenProjectDataServiceImpl extends BaseServiceImpl<ScreenProjectD
                 screenProjectImgDataEntity.setProjectId(item.getProjectId());
                 screenProjectImgDataEntity.setProjectImgUrl(projectImgUrl[i]);
                 screenProjectImgDataEntity.setSort(i);
-                imgList.add(screenProjectImgDataEntity)
+                imgList.add(screenProjectImgDataEntity);
             }
             screenProjectImgDataDao.insertBatch(imgList);
         }
@@ -359,8 +359,12 @@ public class ScreenProjectDataServiceImpl extends BaseServiceImpl<ScreenProjectD
                 if ("external".equals(categoryEntity.getCustomerType())) {
                     entity.setCategoryCode(categoryEntity.getEpmetCategoryCode());
                     CustomerProjectCategoryDictEntity parent = customerProjectCategoryDictService.getByCategoryCode(parentCustomer.getData(), categoryEntity.getEpmetCategoryCode());
-                    entity.setParentCategoryCode(parent.getParentCategoryCode());
-                    entity.setLevel(parent.getLevel());
+                    if (null != parent) {
+                        entity.setParentCategoryCode(parent.getParentCategoryCode());
+                        entity.setLevel(parent.getLevel());
+                    } else {
+                        log.error("未找到对应分类");
+                    }
                 } else {
                     entity.setCategoryCode(categoryEntity.getCategoryCode());
                     entity.setParentCategoryCode(categoryEntity.getParentCategoryCode());