diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/controller/ESAnnualReportController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/controller/ESAnnualReportController.java index ec43c70b..ea2a204e 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/controller/ESAnnualReportController.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/controller/ESAnnualReportController.java @@ -1,9 +1,11 @@ package com.jero.modules.activiti.process.esAnnualReport.controller; import com.jero.common.api.vo.Result; +import com.jero.common.api.vo.ResultCommon; import com.jero.common.aspect.annotation.AutoLog; import com.jero.common.aspect.annotation.Translation; import com.jero.common.constant.enums.YesOrNoEnum; +import com.jero.common.util.MessageUtils; import com.jero.modules.activiti.process.common.entity.TransferVO; import com.jero.modules.activiti.process.common.service.ActFlowCommonService; import com.jero.modules.activiti.process.esAnnualReport.entity.ProcessEsAnnualReport; @@ -85,7 +87,7 @@ public class ESAnnualReportController { return Result.OK(dataList); } else { List msg = (List) resultMap.get("msg"); - return Result.error("导入失败", msg); + return Result.error(MessageUtils.getMessage(ResultCommon.IMPORT_ERROR), msg); } } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/service/impl/ProcessEsAnnualReportServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/service/impl/ProcessEsAnnualReportServiceImpl.java index 2189fad8..c3e6d249 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/service/impl/ProcessEsAnnualReportServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/service/impl/ProcessEsAnnualReportServiceImpl.java @@ -79,9 +79,6 @@ public class ProcessEsAnnualReportServiceImpl extends ServiceImpl executionIdList = actFlowCommonService.getAllChildExecutionIds(executionId); executionIdList.add(executionId); - if (!actFlowCommonService.taskExists(taskId)) { - throw new JeroBootException("任务不存在"); - } AnnualReportDataVO annualReportDataVO = new AnnualReportDataVO(); // 使用流程引擎根据taskId找到流程实例Id String processInstanceId = actFlowCommonService.getProcessInstanceIdByTaskId(taskId); - String processDefinitionId = actFlowCommonService.getProcessDefId(processInstanceId); // 获取流程通用数据 ProcessAll process = processAllService.getByProcessInstanceId(processInstanceId); CommonVO commonVO = new CommonVO();