fix: 81083 企标制修订流程--强制撤回后,草稿没有对应数据
This commit is contained in:
+2
-10
@@ -153,7 +153,7 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
|
|||||||
// 获取第一个任务的taskId
|
// 获取第一个任务的taskId
|
||||||
String taskId = actFlowCommonService.getFirstTaskId(processInstanceId, userId, processDefinitionId);
|
String taskId = actFlowCommonService.getFirstTaskId(processInstanceId, userId, processDefinitionId);
|
||||||
// 手动翻译
|
// 手动翻译
|
||||||
String jsonData = translationAspect.manualParseDictText(this.getHandleData(taskId), actVariables);
|
String jsonData = translationAspect.manualParseDictText(this.getHandleData(taskId), revisionData.getFlowUser());
|
||||||
// 强制撤回
|
// 强制撤回
|
||||||
commonVO.setProcessInstanceId(processInstanceId);
|
commonVO.setProcessInstanceId(processInstanceId);
|
||||||
actFlowCommonService.saveFirstNodeDraft(commonVO, ProcessTypeEnum.ES_REVISION, jsonData);
|
actFlowCommonService.saveFirstNodeDraft(commonVO, ProcessTypeEnum.ES_REVISION, jsonData);
|
||||||
@@ -323,16 +323,8 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
|
|||||||
// 某些节点需要对数据进行特殊处理
|
// 某些节点需要对数据进行特殊处理
|
||||||
switch (xmlNodeId) {
|
switch (xmlNodeId) {
|
||||||
case OTHER_DRAFT_USER_UPLOAD:
|
case OTHER_DRAFT_USER_UPLOAD:
|
||||||
String curUserId = "";
|
|
||||||
try {
|
|
||||||
curUserId = UserUtils.getUserId();
|
|
||||||
} catch (Exception e) {
|
|
||||||
log.error("获取当前用户失败");
|
|
||||||
}
|
|
||||||
boolean findFlag = false;
|
boolean findFlag = false;
|
||||||
otherDraftUserVOS.forEach(o -> {
|
otherDraftUserVOS.forEach(o -> o.setOperateType(null));
|
||||||
o.setOperateType(null);
|
|
||||||
});
|
|
||||||
for (OtherDraftUserVO o : otherDraftUserVOS) {
|
for (OtherDraftUserVO o : otherDraftUserVOS) {
|
||||||
if (findFlag) {
|
if (findFlag) {
|
||||||
o.setOperateType(OperateTypeEnum.CANNOT_OPERATE.getValue());
|
o.setOperateType(OperateTypeEnum.CANNOT_OPERATE.getValue());
|
||||||
|
|||||||
Reference in New Issue
Block a user