diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAbolish/service/impl/ProcessEsAbolishServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAbolish/service/impl/ProcessEsAbolishServiceImpl.java index d7de9199..fbb53a3a 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAbolish/service/impl/ProcessEsAbolishServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAbolish/service/impl/ProcessEsAbolishServiceImpl.java @@ -207,6 +207,7 @@ public class ProcessEsAbolishServiceImpl extends ServiceImpl userMap = new HashMap<>(this.setUserVariables(flowUserInfoVO)); - processNodeLinkService.saveNodeUserLink(processDefinitionId, processInstanceId, userMap); - Map variables = setUserVariables(flowUserInfoVO); + if (data != null) { + saveOrUpdate(data); + ESAbolishFlowUserVO flowUserInfoVO = abolishData.getFlowUser(); + Map variables = this.setVariables(flowUserInfoVO); + processNodeLinkService.saveNodeUserLink(processDefinitionId, processInstanceId, this.getUserMap(variables)); actFlowCommonService.setProcessVariables(processInstanceId, variables); } runtimeService.setVariable(processInstanceId, "pass", true); diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esArchive/service/impl/ProcessEsArchiveServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esArchive/service/impl/ProcessEsArchiveServiceImpl.java index 27ea41da..3b105a12 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esArchive/service/impl/ProcessEsArchiveServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esArchive/service/impl/ProcessEsArchiveServiceImpl.java @@ -14,6 +14,7 @@ import com.jero.modules.activiti.process.common.entity.ProcessDraft; import com.jero.modules.activiti.process.common.enums.ProcessType; import com.jero.modules.activiti.process.common.service.ActFlowCommonService; import com.jero.modules.activiti.process.common.service.ProcessDraftService; +import com.jero.modules.activiti.process.esAbolish.entity.vo.ESAbolishFlowUserVO; import com.jero.modules.activiti.process.esArchive.entity.ProcessEsArchive; import com.jero.modules.activiti.process.esArchive.entity.vo.ESArchiveDataVO; import com.jero.modules.activiti.process.esArchive.entity.vo.ESArchiveFlowUserVO; @@ -207,6 +208,7 @@ public class ProcessEsArchiveServiceImpl extends ServiceImpl userMap = new HashMap<>(this.setUserVariables(flowUserInfoVO)); - processNodeLinkService.saveNodeUserLink(processDefinitionId, processInstanceId, userMap); - Map variables = setUserVariables(flowUserInfoVO); + if (data != null) { + saveOrUpdate(data); + ESArchiveFlowUserVO flowUserInfoVO = archiveData.getFlowUser(); + Map variables = this.setVariables(flowUserInfoVO); + processNodeLinkService.saveNodeUserLink(processDefinitionId, processInstanceId, this.getUserMap(variables)); actFlowCommonService.setProcessVariables(processInstanceId, variables); } runtimeService.setVariable(processInstanceId, "pass", true);