From 273200faff4c07560bd2a19b46d4d27b08b917b5 Mon Sep 17 00:00:00 2001 From: yjz <3131811435@qq.com> Date: Thu, 22 Aug 2024 09:27:33 +0800 Subject: [PATCH] =?UTF-8?q?fix(89221):=20=E6=A0=87=E5=87=86=E8=A7=A3?= =?UTF-8?q?=E8=AF=BB=E6=B5=81=E7=A8=8B=E8=BD=AC=E5=8A=9E=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/jero/modules/activiti/entity/ProcessAll.java | 2 +- .../service/impl/StandardInterpretFlowServiceImpl.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/entity/ProcessAll.java b/laws-modules/src/main/java/com/jero/modules/activiti/entity/ProcessAll.java index f31415a2..945c5596 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/entity/ProcessAll.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/entity/ProcessAll.java @@ -199,7 +199,7 @@ public class ProcessAll { @TableField(exist = false) private String countersignFlag; - @ApiModelProperty(value = "标准主解读人分发节点是否显示驳回/转办（字典：1：是，0：否）") + @ApiModelProperty(value = "是否显示驳回/转办（字典：1：是，0：否）") @Dict(dicCode = "yn") @TableField(exist = false) private String showRejectTransition = "1"; diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/service/impl/StandardInterpretFlowServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/service/impl/StandardInterpretFlowServiceImpl.java index 0100394c..94df25c4 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/service/impl/StandardInterpretFlowServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardinterpret/service/impl/StandardInterpretFlowServiceImpl.java @@ -730,7 +730,7 @@ public class StandardInterpretFlowServiceImpl implements StandardInterpretFlowSe && YesOrNoEnum.NO.getValue().equals(processStandardInterpret.getChooseClause())){ processStandardInterpretClauseList = new ArrayList<>(); } - // 是否显示驳回 + // 是否显示驳回/转办 // 查询是否存在子流程 int count = processApprovalRecordService.count( new LambdaQueryWrapper() @@ -738,7 +738,7 @@ public class StandardInterpretFlowServiceImpl implements StandardInterpretFlowSe processApprovalRecord.getProcessInstanceId()) .isNotNull(ProcessApprovalRecord::getParentTaskId)); if (count > 0 || StandardInterpretCommon.MASTER_INTERPRET_AGAIN_DISTRIBUTE.equals(node)){ - processStandardInterpret.setShowReject(YesOrNoEnum.NO.getValue()); + processStandardInterpret.setShowRejectTransition(YesOrNoEnum.NO.getValue()); } }