From e54bf5b3cd22bd78f5064da9a8eb1a22a108d4d1 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Wed, 17 Jan 2024 17:11:19 +0800 Subject: [PATCH] =?UTF-8?q?fix:=2080923=20=E4=BC=81=E6=A0=87=E8=AE=A1?= =?UTF-8?q?=E5=88=92=E7=AB=8B=E9=A1=B9/=E5=8F=98=E6=9B=B4=E6=B5=81?= =?UTF-8?q?=E7=A8=8B--=E6=89=8B=E6=9C=BA=E7=AB=AF=E5=B7=B2=E5=A4=84?= =?UTF-8?q?=E7=90=86=EF=BC=8CPC=E9=A1=B5=E9=9D=A2=E5=86=8D=E6=AC=A1?= =?UTF-8?q?=E5=AE=A1=E6=89=B9=EF=BC=8C=E6=8F=90=E7=A4=BA=E8=AF=AD=E7=BB=9F?= =?UTF-8?q?=E4=B8=80=E6=8D=A2=E4=B8=80=E4=B8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/ProcessEsAbolishServiceImpl.java | 6 +++--- .../service/impl/ProcessEsAnnualInitServiceImpl.java | 2 +- .../service/impl/ProcessEsAnnualReportServiceImpl.java | 2 +- .../service/impl/ProcessEsArchiveServiceImpl.java | 6 +++--- .../esChange/service/impl/ProcessEsChangeServiceImpl.java | 8 ++++---- .../esEnable/service/impl/ProcessEsEnableServiceImpl.java | 6 +++--- .../service/impl/ProcessEsInitChangeServiceImpl.java | 6 +++--- .../service/impl/ProcessEsRecheckServiceImpl.java | 6 +++--- .../esRevision/service/impl/EsRevisionServiceImpl.java | 2 +- 9 files changed, 22 insertions(+), 22 deletions(-) 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 d30b38b0..49089169 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 @@ -181,6 +181,9 @@ public class ProcessEsAbolishServiceImpl extends ServiceImpl flowUser = abolishData.getFlowUser(); // 获取流程实例ID String processInstanceId = actFlowCommonService.getProcessInstanceIdByTaskId(taskId); @@ -189,9 +192,6 @@ public class ProcessEsAbolishServiceImpl extends ServiceImpl flowUser = annualInitData.getFlowUser(); String taskId = commonVO.getTaskId(); // 获取task - if (StrUtil.isBlank(taskId) && !actFlowCommonService.taskExists(taskId)) { + if (StrUtil.isBlank(taskId) || !actFlowCommonService.taskExists(taskId)) { throw new JeroBootException("taskId为空或任务不存在"); } String userId = actFlowCommonService.getOriginTaskAssignee(taskId); 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 377aa773..f574d8f5 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 @@ -153,7 +153,7 @@ public class ProcessEsAnnualReportServiceImpl extends ServiceImpl dataList = annualReportDataVO.getDataList(); String taskId = commonVO.getTaskId(); // 获取task - if (StrUtil.isBlank(taskId) && !actFlowCommonService.taskExists(taskId)) { + if (StrUtil.isBlank(taskId) || !actFlowCommonService.taskExists(taskId)) { throw new JeroBootException("taskId为空或任务不存在"); } Task task = taskService.createTaskQuery().taskId(taskId).singleResult(); 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 2fc65aae..c3348c63 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 @@ -184,6 +184,9 @@ public class ProcessEsArchiveServiceImpl extends ServiceImpl flowUser = archiveDataVO.getFlowUser(); String taskId = commonVO.getTaskId(); + if (StrUtil.isBlank(taskId) || !actFlowCommonService.taskExists(taskId)) { + throw new JeroBootException(ResultCommon.TASK_NOT_EXISTS); + } // 获取流程实例ID String processInstanceId = actFlowCommonService.getProcessInstanceIdByTaskId(taskId); // 获取流程实例对象 @@ -191,9 +194,6 @@ public class ProcessEsArchiveServiceImpl extends ServiceImpl flowUser = changeData.getFlowUser(); String taskId = commonVO.getTaskId(); - // 获取流程实例ID - String processInstanceId = actFlowCommonService.getProcessInstanceIdByTaskId(taskId); - if (StrUtil.isBlank(taskId) && !actFlowCommonService.taskExists(taskId)) { + if (StrUtil.isBlank(taskId) || !actFlowCommonService.taskExists(taskId)) { throw new JeroBootException(ResultCommon.TASK_NOT_EXISTS); } + Map flowUser = changeData.getFlowUser(); + // 获取流程实例ID + String processInstanceId = actFlowCommonService.getProcessInstanceIdByTaskId(taskId); // 获取流程实例对象 ProcessInstance processInstance = runtimeService.createProcessInstanceQuery() .processInstanceId(processInstanceId).singleResult(); diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esEnable/service/impl/ProcessEsEnableServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esEnable/service/impl/ProcessEsEnableServiceImpl.java index addeb6cf..667021b4 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esEnable/service/impl/ProcessEsEnableServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esEnable/service/impl/ProcessEsEnableServiceImpl.java @@ -180,6 +180,9 @@ public class ProcessEsEnableServiceImpl extends ServiceImpl flowUser = enableData.getFlowUser(); // 获取流程实例ID String processInstanceId = actFlowCommonService.getProcessInstanceIdByTaskId(taskId); @@ -188,9 +191,6 @@ public class ProcessEsEnableServiceImpl extends ServiceImpl initChangeList = initChangeDataVO.getDataList(); - Map flowUserInfoVO = initChangeDataVO.getFlowUserInfoVO(); String taskId = commonVO.getTaskId(); - if (StrUtil.isBlank(taskId) && !actFlowCommonService.taskExists(taskId)) { + if (StrUtil.isBlank(taskId) || !actFlowCommonService.taskExists(taskId)) { throw new JeroBootException(ResultCommon.TASK_NOT_EXISTS); } + List initChangeList = initChangeDataVO.getDataList(); + Map flowUserInfoVO = initChangeDataVO.getFlowUserInfoVO(); String processInstanceId = actFlowCommonService.getProcessInstanceIdByTaskId(taskId); String processDefinitionId = actFlowCommonService.getProcessDefId(processInstanceId); Task task = taskService.createTaskQuery().taskId(taskId).singleResult(); diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/service/impl/ProcessEsRecheckServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/service/impl/ProcessEsRecheckServiceImpl.java index 1925a1c9..afadc949 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/service/impl/ProcessEsRecheckServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/service/impl/ProcessEsRecheckServiceImpl.java @@ -204,12 +204,12 @@ public class ProcessEsRecheckServiceImpl extends ServiceImpl flowUser = recheckData.getFlowUser(); String taskId = commonVO.getTaskId(); - if (StrUtil.isBlank(taskId) && !actFlowCommonService.taskExists(taskId)) { + if (StrUtil.isBlank(taskId) || !actFlowCommonService.taskExists(taskId)) { throw new JeroBootException(ResultCommon.TASK_NOT_EXISTS); } + ProcessEsRecheck data = recheckData.getData(); + Map flowUser = recheckData.getFlowUser(); String processInstanceId = actFlowCommonService.getProcessInstanceIdByTaskId(taskId); if (pass) { saveOrUpdate(recheckData.getData()); 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 af0bd045..5d048c90 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 @@ -310,7 +310,7 @@ public class EsRevisionServiceImpl extends ServiceImpl