Merge remote-tracking branch 'origin/dev_issue_audit' into dev_temp

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java

@@ -366,22 +366,20 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
                     if(!isStaffAudition)
                        if(StringUtils.equals(ModuleConstants.ISSUE_APPLICATION_STATUS_UNDER_AUDITING,applicationList.iterator().next().getApplyStatus()))
                         ifRepeat = true;
-
+                    applyIds.addAll(applicationList.stream().map(IssueApplicationDTO::getId).collect(Collectors.toList()));
                 }
                 if(!ifRepeat) {
                 applicationList.forEach(apply -> {
                         IssueApplicationDTO carrier = new IssueApplicationDTO();
                         carrier.setId(apply.getId());
                         carrier.setApplyStatus(defaultStatusUnderAuditing);
-                        carrier.setSuggestion(!isStaffAudition ? apply.getSuggestion() : param.getSuggestion());
+                        carrier.setSuggestion(isStaffAudition ? apply.getSuggestion() : param.getSuggestion());
-                        carrier.setIssueTitle(!isStaffAudition ? apply.getIssueTitle() : param.getIssueTitle());
+                        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 ? param.getIssueId() : null);
+                        carrier.setIssueId(isStaffAudition ? StringUtils.equals(ModuleConstants.AUDITION_TYPE_APPROVAL,param.getAudition().getActionType()) ? param.getIssueId() : null : null);
                         carrier.setUpdatedTime(param.getCreatedTime());
                         carrier.setUpdatedBy(param.getUserId());
                         applicationService.update(carrier);
-
-                        applyIds.add(apply.getId());
                     });
 
 
@@ -409,7 +407,7 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
                     });
 
                 }
-                    result.setIssueApplicationId(applyIds.iterator().next());
+                    result.setIssueApplicationId(applyIds.get(NumConstant.ZERO));
 
 
         //只有当审核开关关闭 或 工作端人员审核通过时才生成议题