diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java index edb65f71..ef91f817 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java @@ -129,8 +129,15 @@ public class EsRevisionServiceImpl extends ServiceImpl o.setFinishFlag(YesOrNoEnum.NO.getValue())); - data.setOtherDrafterUploadFileJson(data.getOtherDraftUserVOS()); + List otherDraftUserVOS = data.getOtherDraftUserVOS(); + if (otherDraftUserVOS != null && !otherDraftUserVOS.isEmpty()) { + data.getOtherDraftUserVOS().forEach(o -> o.setFinishFlag(YesOrNoEnum.NO.getValue())); + data.setOtherDrafterUploadFileJson(otherDraftUserVOS); + data.setProofreader(otherDraftUserVOS.stream() + .map(OtherDraftUserVO::getUser) + .distinct() + .collect(Collectors.joining(","))); + } save(data); // 手动设置所有流程变量 actFlowCommonService.setProcessVariables(processInstanceId, actVariables); @@ -417,6 +424,10 @@ public class EsRevisionServiceImpl extends ServiceImpl o.setFinishFlag(YesOrNoEnum.NO.getValue())); + data.setProofreader(otherDraftUserVOS.stream() + .map(OtherDraftUserVO::getUser) + .distinct() + .collect(Collectors.joining(","))); data.setOtherDraftUserVOS(otherDraftUserVOS); data.setOtherDrafterUploadFileJson(otherDraftUserVOS); }