From 23024322e83bbdc2d25424fa8588dc49a9b46437 Mon Sep 17 00:00:00 2001 From: liao Date: Mon, 20 Nov 2023 17:03:58 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E8=A7=A3=E5=86=B3=E9=94=81=E8=A1=A8?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../process/fb/service/IProcessHandleService.java | 7 +++++++ .../fb/service/impl/ProcessHandleServiceImpl.java | 9 ++++++--- .../modules/activiti/service/ProcessNodeLinkService.java | 2 ++ 3 files changed, 15 insertions(+), 3 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 3a27fb27..a5ca0187 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 @@ -83,6 +83,13 @@ public interface IProcessHandleService { **/ String getDefinitionIdByKey(String definitionKey); + /** + * @Author: liao + * @Date: 2023/11/20 16:48 + * @Description: 删除自己的草稿 + **/ + void deleteMyDraft(String businessId); + /** * @Author: liao * @Date: 2023/11/8 11:16 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 cf92e3a7..877fbd52 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 @@ -1,5 +1,6 @@ package com.jero.modules.activiti.process.fb.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.jero.common.exception.JeroBootException; import com.jero.modules.activiti.entity.ProcessAll; import com.jero.modules.activiti.entity.ProcessApprovalRecord; @@ -298,13 +299,15 @@ public class ProcessHandleServiceImpl implements IProcessHandleService { * @Date: 2023/11/9 16:46 * @Description: 删除自己的草稿 **/ - private void deleteMyDraft(String businessId) { - /*if (StringUtils.isNotBlank(businessId)) { + @Transactional + @Override + public void deleteMyDraft(String businessId) { + if (StringUtils.isNotBlank(businessId)) { LambdaQueryWrapper deleteWrapper = new LambdaQueryWrapper<>(); deleteWrapper.eq(ProcessDraft::getProjectId, businessId); deleteWrapper.eq(ProcessDraft::getUserId, CurrentUserUtil.getId()); processDraftService.remove(deleteWrapper); - }*/ + } } /** diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessNodeLinkService.java b/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessNodeLinkService.java index fc615459..ecf7f52b 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessNodeLinkService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessNodeLinkService.java @@ -11,6 +11,7 @@ import org.springframework.stereotype.Service; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.modules.activiti.mapper.ProcessNodeLinkMapper; import com.jero.modules.activiti.entity.ProcessNodeLink; +import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.ArrayList; @@ -28,6 +29,7 @@ public class ProcessNodeLinkService extends ServiceImpl map) { LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); wrapper.eq(ProcessNode::getProcessDefinitionId,processDefinitionId);