From 29e4122b8cf70ae1fc2cece7fcbe1490b1821100 Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Tue, 24 Nov 2020 13:56:05 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9C=A8=E5=AE=A1=E6=A0=B8=E9=80=9A=E8=BF=87?=
 =?UTF-8?q?=E6=97=B6=E5=A1=AB=E5=85=85=20=E5=AE=A1=E6=A0=B8=E9=80=9A?=
 =?UTF-8?q?=E8=BF=87=E4=BA=BAId=20=E5=AE=A1=E6=A0=B8=E9=80=9A=E8=BF=87?=
 =?UTF-8?q?=E7=9A=84=E5=8E=9F=E5=9B=A0=20=E7=94=9F=E6=88=90=E7=9A=84?=
 =?UTF-8?q?=E8=AE=AE=E9=A2=98Id?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/service/impl/IssueServiceImpl.java   | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java
index 80f44c403b..75749a7539 100644
--- a/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java
+++ b/epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java
@@ -382,6 +382,8 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
                         carrier.setIssueTitle(isStaffAudition ? apply.getIssueTitle() : param.getIssueTitle());
                         carrier.setPassedReason(isStaffAudition ? StringUtils.equals(ModuleConstants.AUDITION_TYPE_APPROVAL,param.getAudition().getActionType()) ? param.getAudition().getReason() :null : null);
                         carrier.setIssueId(isStaffAudition ? StringUtils.equals(ModuleConstants.AUDITION_TYPE_APPROVAL,param.getAudition().getActionType()) ? param.getIssueId() : null : null);
+                        carrier.setApproveStaffId(isStaffAudition ? StringUtils.equals(ModuleConstants.AUDITION_TYPE_APPROVAL,param.getAudition().getActionType()) ? param.getUserId() : null : null);
+
                         carrier.setUpdatedTime(param.getCreatedTime());
                         carrier.setUpdatedBy(param.getUserId());
                         applicationService.update(carrier);
@@ -486,6 +488,9 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
                         param.setStaffName(staffBasicInfo.getData().getRealName());
                     }
                     issueParam2.setAudition(param);
+                    //如果这里不赋值，在更新application和新增applicationHistory时会检测到updatedBy和createdBy为空
+                    //从而去httpServletRequest中获取当前请求的userId，FIXME 但是其余字段不会！
+                    issueParam2.setUserId(token.getUserId());
                     FirstTopicShiftedToIssueApplicationResultDTO issueResult = topicShiftedToIssueV2(issueParam2);
                     app2update.setIssueId(issueResult.getIssueId());