From b58eb837993c1f0ea6f13d58b1747f46a58152c2 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 12 Oct 2022 16:30:10 +0800
Subject: [PATCH] =?UTF-8?q?=E7=9C=BC=E7=9E=8E=E4=BA=86=E3=80=82originId?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/controller/ProjectController.java  | 7 +++++++
 .../java/com/epmet/service/impl/ProjectServiceImpl.java    | 6 ++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectController.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectController.java
index 4330ea21a7..101a735cfe 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectController.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/controller/ProjectController.java
@@ -451,6 +451,13 @@ public class ProjectController {
         }
     }
 
+    /**
+     * 纯属为了测试....
+     * 如果项目结案了，事件没有回写可以调用此方法
+     * @param tokenDto
+     * @param projectId
+     * @return
+     */
     @PostMapping("test-close/{projectId}")
     public Result testClose(@LoginUser TokenDto tokenDto,@PathVariable("projectId")String projectId){
         projectService.modifyIcEvent(null,tokenDto.getUserId(),new Date(),projectId);
diff --git a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
index 82f79d586f..3b99956e6a 100644
--- a/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
+++ b/epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectServiceImpl.java
@@ -879,12 +879,14 @@ public class ProjectServiceImpl extends BaseServiceImpl<ProjectDao, ProjectEntit
 	 * @param closeCaseTime 结案时间
 	 */
 	 public void modifyIcEvent(ProjectEntity projectEntity,String userId,Date closeCaseTime,String projectId) {
-		ProjectEntity projectEntity1=baseDao.selectById(projectId);
+		 if (null == projectEntity) {
+			 projectEntity = baseDao.selectById(projectId);
+		 }
 		boolean icEventFlag = false;
 		String icEventId = "";
 		if ("issue".equals(projectEntity1.getOrigin())) {
 			List<String> issueIds = new ArrayList<>();
-			issueIds.add(projectEntity1.getOrigin());
+			issueIds.add(projectEntity1.getOriginId());
 			Result<List<IssueProfileDTO>> issueRes = govIssueOpenFeignClient.getIssueProfile(issueIds);
 			if (issueRes.success() && CollectionUtils.isNotEmpty(issueRes.getData())) {
 				IssueProfileDTO issueProfileDTO = issueRes.getData().get(NumConstant.ZERO);