From ab2ebff443e17c2a048becc56968650434dd1ed2 Mon Sep 17 00:00:00 2001
From: wangxianzhang <wangxianzhang>
Date: Wed, 25 May 2022 15:27:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E4=BA=8B=E4=BB=B6?=
 =?UTF-8?q?=E5=A4=84=E7=90=86=E5=88=86=E6=9E=90=EF=BC=8C=E4=BA=8B=E4=BB=B6?=
 =?UTF-8?q?=E6=B2=A1=E6=9C=89=E5=88=86=E7=B1=BB=E6=97=B6=E5=80=99=E5=8F=91?=
 =?UTF-8?q?=E7=94=9F=E7=9A=84=E7=A9=BA=E6=8C=87=E9=92=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/IcEventServiceImpl.java      | 25 +++++++++++--------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java
index 39a80c39ca..463fc759ba 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/IcEventServiceImpl.java
@@ -583,15 +583,6 @@ public class IcEventServiceImpl extends BaseServiceImpl<IcEventDao, IcEventEntit
             return null;
         }
 
-        // 事件分类
-        IcEventCategoryEntity eventCategory = icEventCategoryService.getByEventId(eventId);
-        // 分类字典
-        IssueProjectCategoryDictDTO categoryDictItem = getResultDataOrThrowsException(govIssueOpenFeignClient.getByCategoryCode(eventCategory.getCategoryCode()),
-                ServiceConstant.GOV_ISSUE_SERVER,
-                EpmetErrorCode.SERVER_ERROR.getCode(),
-                "【事件研判分析】查询分类字典失败",
-                "【事件研判分析】查询分类字典失败");
-
         // 上报人信息
         IcEventYpAnalysisResultDTO r = new IcEventYpAnalysisResultDTO();
         String idCard = event.getIdCard();
@@ -617,12 +608,24 @@ public class IcEventServiceImpl extends BaseServiceImpl<IcEventDao, IcEventEntit
         r.setReportorName(event.getName());
         r.setSourceTypeName(sourceTypeMap.get(event.getSourceType()));
         r.setDependents(dependents);
-        r.setCategoryCode(categoryDictItem.getParentCategoryCode());
-        r.setCategoryPids(eventCategory.getCategoryPids());
         r.setReportorMobile(event.getMobile());
         r.setReportorIdCard(idCard);
         r.setResiReportEventCount(resiReportEventCount);
+
+        // 事件分类
+        IcEventCategoryEntity eventCategory = icEventCategoryService.getByEventId(eventId);
+
+        // 有的事件刚创建，可能没有分类
         if (eventCategory != null) {
+            // 分类字典
+            IssueProjectCategoryDictDTO categoryDictItem = getResultDataOrThrowsException(govIssueOpenFeignClient.getByCategoryCode(eventCategory.getCategoryCode()),
+                    ServiceConstant.GOV_ISSUE_SERVER,
+                    EpmetErrorCode.SERVER_ERROR.getCode(),
+                    "【事件研判分析】查询分类字典失败",
+                    "【事件研判分析】查询分类字典失败");
+
+            r.setCategoryCode(categoryDictItem.getParentCategoryCode());
+            r.setCategoryPids(eventCategory.getCategoryPids());
             r.setCategoryName(categoryDictItem.getParentCategoryName());
         }