From 7cb4fbb2c1196c1e651302649c1bf67f0c8c65c3 Mon Sep 17 00:00:00 2001 From: liao Date: Tue, 28 Nov 2023 11:02:48 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E6=A0=87=E5=87=86=E5=BE=81=E6=B1=82?= =?UTF-8?q?=E6=84=8F=E8=A7=81=E6=B5=81=E7=A8=8B-=E4=BF=9D=E5=AD=98?= =?UTF-8?q?=E4=B8=BA=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 | 11 ++++++----- 2 files changed, 7 insertions(+), 6 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 8e48b825..c468ad37 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 taskId); + void deleteMyDraft(String taskId, String businessId); /** * @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 9f8e55ce..0a2a720d 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.getBasicTaskInfoDTO().getTaskId()); + deleteMyDraft(processInfoVO.getBasicTaskInfoDTO().getTaskId(), processInfoVO.getBusinessId()); BasicProcessInfoDTO basicProcessInfoDTO = processInfoVO.getBasicProcessInfoDTO(); // 流程信息 Map userInfoMap = processInfoVO.getUserInfoMap(); // 用户变量map @@ -126,7 +126,7 @@ public class ProcessHandleServiceImpl implements IProcessHandleService { isMyTask(taskId); // 删除自己的草稿 - deleteMyDraft(taskId); + deleteMyDraft(taskId, processInfoVO.getBusinessId()); ProcessDTO processDTO = getProcessDTO(taskId); String processInstanceId = processDTO.getProcessInstanceId(); @@ -189,7 +189,7 @@ public class ProcessHandleServiceImpl implements IProcessHandleService { ProcessApprovalRecord processApprovalRecord = processApprovalRecordService.getToDoByTaskId(taskId); // 删除自己的草稿 - deleteMyDraft(taskId); + deleteMyDraft(taskId, processApprovalRecord.getProjectId()); processApprovalRecord.setTransferBy(CurrentUserUtil.getId()); // 转办人 processApprovalRecord.setUserId(toUserId); // 任务处理人 @@ -281,7 +281,7 @@ public class ProcessHandleServiceImpl implements IProcessHandleService { BasicTaskInfoDTO basicTaskInfoDTO = processInfoVO.getBasicTaskInfoDTO(); // 删除自己的草稿 - deleteMyDraft(basicTaskInfoDTO.getTaskId()); + deleteMyDraft(basicTaskInfoDTO.getTaskId(), processInfoVO.getBusinessId()); ProcessDraft processDraft = new ProcessDraft(); processDraft.setProjectId(processInfoVO.getBusinessId()); // 业务id @@ -303,9 +303,10 @@ public class ProcessHandleServiceImpl implements IProcessHandleService { **/ @Transactional @Override - public void deleteMyDraft(String taskId) { + public void deleteMyDraft(String taskId, String businessId) { LambdaQueryWrapper deleteWrapper = new LambdaQueryWrapper<>(); deleteWrapper.eq(ProcessDraft::getUserId, CurrentUserUtil.getId()); + deleteWrapper.eq(ProcessDraft::getProjectId, businessId); if (StringUtils.isNotBlank(taskId)) { deleteWrapper.eq(ProcessDraft::getTaskId, taskId); }