From 511bdd4b45508d29c2ece3c8c3e3d8835656c0ac Mon Sep 17 00:00:00 2001 From: liao Date: Thu, 23 Nov 2023 09:49:04 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E6=B5=81=E7=A8=8B=E8=8D=89=E7=A8=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../process/fb/service/IProcessHandleService.java | 2 +- .../fb/service/impl/ProcessHandleServiceImpl.java | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/IProcessHandleService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/IProcessHandleService.java index a5ca0187..2140c125 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/IProcessHandleService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/IProcessHandleService.java @@ -88,7 +88,7 @@ public interface IProcessHandleService { * @Date: 2023/11/20 16:48 * @Description: 删除自己的草稿 **/ - void deleteMyDraft(String businessId); + void deleteMyDraft(String taskId); /** * @Author: liao diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessHandleServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessHandleServiceImpl.java index 4874af7d..0a79a6f7 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessHandleServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessHandleServiceImpl.java @@ -66,7 +66,7 @@ public class ProcessHandleServiceImpl implements IProcessHandleService { @Transactional public String startProcess(ProcessInfoVO processInfoVO) { // 删除自己的草稿 - deleteMyDraft(processInfoVO.getBusinessId()); + deleteMyDraft(processInfoVO.getBasicTaskInfoDTO().getTaskId()); BasicProcessInfoDTO basicProcessInfoDTO = processInfoVO.getBasicProcessInfoDTO(); // 流程信息 Map userInfoMap = processInfoVO.getUserInfoMap(); // 用户变量map @@ -126,7 +126,7 @@ public class ProcessHandleServiceImpl implements IProcessHandleService { isMyTask(taskId); // 删除自己的草稿 - deleteMyDraft(processInfoVO.getBusinessId()); + deleteMyDraft(taskId); ProcessDTO processDTO = getProcessDTO(taskId); String processInstanceId = processDTO.getProcessInstanceId(); @@ -189,7 +189,7 @@ public class ProcessHandleServiceImpl implements IProcessHandleService { ProcessApprovalRecord processApprovalRecord = processApprovalRecordService.getToDoByTaskId(taskId); // 删除自己的草稿 - deleteMyDraft(processApprovalRecord.getProjectId()); + deleteMyDraft(taskId); processApprovalRecord.setTransferBy(CurrentUserUtil.getId()); // 转办人 processApprovalRecord.setUserId(toUserId); // 任务处理人 @@ -281,7 +281,7 @@ public class ProcessHandleServiceImpl implements IProcessHandleService { BasicTaskInfoDTO basicTaskInfoDTO = processInfoVO.getBasicTaskInfoDTO(); // 删除自己的草稿 - deleteMyDraft(processInfoVO.getBusinessId()); + deleteMyDraft(basicTaskInfoDTO.getTaskId()); ProcessDraft processDraft = new ProcessDraft(); processDraft.setProjectId(processInfoVO.getBusinessId()); // 业务id @@ -303,10 +303,10 @@ public class ProcessHandleServiceImpl implements IProcessHandleService { **/ @Transactional @Override - public void deleteMyDraft(String businessId) { - if (StringUtils.isNotBlank(businessId)) { + public void deleteMyDraft(String taskId) { + if (StringUtils.isNotBlank(taskId)) { LambdaQueryWrapper deleteWrapper = new LambdaQueryWrapper<>(); - deleteWrapper.eq(ProcessDraft::getProjectId, businessId); + deleteWrapper.eq(ProcessDraft::getTaskId, taskId); deleteWrapper.eq(ProcessDraft::getUserId, CurrentUserUtil.getId()); processDraftService.remove(deleteWrapper); }