From 18a4b148626fe484908c30e2d8256c53dbf8940e Mon Sep 17 00:00:00 2001 From: yjz <3131811435@qq.com> Date: Wed, 24 Jul 2024 16:28:09 +0800 Subject: [PATCH] =?UTF-8?q?fix(87365):=20=E6=A0=87=E5=87=86=E8=A7=A3?= =?UTF-8?q?=E8=AF=BB=E6=B5=81=E7=A8=8B--=E9=83=A8=E5=88=86=E5=8F=AF?= =?UTF-8?q?=E8=B7=B3=E8=BF=87=E8=8A=82=E7=82=B9=E9=83=BD=E5=B1=95=E7=A4=BA?= =?UTF-8?q?=E4=BA=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../activiti/service/ProcessNodeService.java | 25 +++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessNodeService.java b/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessNodeService.java index 62ac5b30..b74bd437 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessNodeService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessNodeService.java @@ -7,12 +7,17 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.constant.enums.YesOrNoEnum; import com.jero.modules.activiti.common.ActivitiCommon; +import com.jero.modules.activiti.entity.ProcessAll; import com.jero.modules.activiti.entity.ProcessApprovalRecord; import com.jero.modules.activiti.entity.ProcessModelNode; import com.jero.modules.activiti.entity.ProcessNode; +import com.jero.modules.activiti.enums.ProcessStatusEnum; import com.jero.modules.activiti.mapper.ProcessModelNodeMapper; import com.jero.modules.activiti.mapper.ProcessNodeMapper; import com.jero.modules.activiti.process.common.enums.ProcessType; +import com.jero.modules.activiti.process.standardinterpret.common.StandardInterpretCommon; +import com.jero.modules.activiti.process.standardinterpret.entity.ProcessStandardInterpret; +import com.jero.modules.activiti.process.standardinterpret.service.ProcessStandardInterpretService; import lombok.extern.slf4j.Slf4j; import org.activiti.engine.HistoryService; import org.activiti.engine.RuntimeService; @@ -55,6 +60,12 @@ public class ProcessNodeService extends ServiceImpl wrapper = new LambdaQueryWrapper<>(); wrapper.eq(ProcessModelNode::getNodeType, "userTask"); @@ -139,6 +150,20 @@ public class ProcessNodeService extends ServiceImpl() + .eq(ProcessAll::getProcessInstanceId, processInstanceId) + .ne(ProcessAll::getPrcStatus, ProcessStatusEnum.WITHDRAWN.getValue()), false); + ProcessStandardInterpret processStandardInterpret = processStandardInterpretService.getOne( + new LambdaQueryWrapper() + .eq(ProcessStandardInterpret::getProjectId, processAll.getProjectId())); + if (!String.valueOf(StandardInterpretCommon.IS_DISTRIBUTE_1) + .equals(processStandardInterpret.getDistribute())){ + processNodeList.removeIf(v -> + StandardInterpretCommon.MASTER_INTERPRET_SUMMARY.equals(v.getXmlNodeId())); + } + } return processNodeList; }