在审核通过时填充 审核通过人Id 审核通过的原因 生成的议题Id

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());