From 825e65fe0dbab7c1dea9a06bb38f89285177d3e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=A9=AC=E4=B8=89=E7=82=AE?= <15856818120@163.com> Date: Thu, 6 Mar 2025 11:01:00 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A2=86=E7=94=A8=E5=AE=A1=E6=89=B9=E4=BC=98?= =?UTF-8?q?=E5=8C=96=EF=BC=8C=E5=8A=A0=E4=B8=8A=E4=BC=9A=E7=AD=BE=E7=9A=84?= =?UTF-8?q?=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/bonus/common/biz/domain/lease/LeaseApplyInfo.java | 2 +- .../bonus/material/lease/service/impl/LeaseTaskServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/lease/LeaseApplyInfo.java b/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/lease/LeaseApplyInfo.java index 1b4ef9e7..51cbc158 100644 --- a/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/lease/LeaseApplyInfo.java +++ b/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/lease/LeaseApplyInfo.java @@ -284,7 +284,7 @@ public class LeaseApplyInfo extends BaseEntity{ @ApiModelProperty(value = "设备id") private Long maId; - @ApiModelProperty(value = "所属记录") + @ApiModelProperty(value = "流程节点签名方式 0:或签 1:会签") private Integer nodeSignType; diff --git a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseTaskServiceImpl.java b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseTaskServiceImpl.java index 4cd40c23..510f11d7 100644 --- a/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseTaskServiceImpl.java +++ b/bonus-modules/bonus-material/src/main/java/com/bonus/material/lease/service/impl/LeaseTaskServiceImpl.java @@ -395,7 +395,7 @@ public class LeaseTaskServiceImpl implements ILeaseTaskService { log.info("当前节点为{}",leaseApplyInfoNew.getNodeId()); SysWorkflowRecordHistory sysWorkflowRecordHistory = sysWorkflowRecordHistoryMapper.getWorkflowRecordHistoryByRecordId(leaseApplyInfoNew.getRecordId()); leaseApplyInfoNew.setNodeId(sysWorkflowRecordHistory.getNodeId()); - if (sysWorkflowRecordHistory.getNodeSort()==1){ + if (1==leaseApplyInfoNew.getNodeSignType() && sysWorkflowRecordHistory.getNodeSort()==1){ leaseApplyInfoNew.setNodeId(sysWorkflowRecordHistory.getNextNodeId()); } String configValue = sysWorkflowConfigMapper.selectConfigValueByNodeId(leaseApplyInfoNew.getNodeId());