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 75749a7539..24489f5e69 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 @@ -414,7 +414,8 @@ public class IssueServiceImpl extends BaseServiceImpl imp }); } - result.setIssueApplicationId(applyIds.get(NumConstant.ZERO)); + if(CollectionUtils.isNotEmpty(applyIds)) + result.setIssueApplicationId(applyIds.iterator().next()); //只有当审核开关关闭 或 工作端人员审核通过时才生成议题 @@ -422,6 +423,17 @@ public class IssueServiceImpl extends BaseServiceImpl imp ValidatorUtils.validateEntity(param, IssueShiftedFromTopicFormDTO.IssueGenerationGroup.class); if(isStaffAudition) param.setUserId(param.getIssueAuthorId()); result.setIssueId(issueShiftedToTopic(param)); + if(StringUtils.equals(ModuleConstants.AUDITION_TYPE_AUTO_PASSED,defaultStatusUnderAuditing)){ + applicationList.forEach(apply -> { + IssueApplicationDTO carrier = new IssueApplicationDTO(); + carrier.setId(apply.getId()); + carrier.setIssueId(result.getIssueId()); + carrier.setUpdatedTime(param.getCreatedTime()); + carrier.setUpdatedBy(param.getUserId()); + applicationService.update(carrier); + }); + } + } return result;