update 标准征求意见流程-保存为草稿

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

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<String, Object> 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<ProcessDraft> deleteWrapper = new LambdaQueryWrapper<>();
         deleteWrapper.eq(ProcessDraft::getUserId, CurrentUserUtil.getId());
+        deleteWrapper.eq(ProcessDraft::getProjectId, businessId);
         if (StringUtils.isNotBlank(taskId)) {
             deleteWrapper.eq(ProcessDraft::getTaskId, taskId);
         }