From b586f20471d4a08f782d9da29a80fcf9ccd79fc7 Mon Sep 17 00:00:00 2001 From: wangli <274027703@qq.com> Date: Thu, 6 Mar 2025 10:29:30 +0800 Subject: [PATCH 1/2] =?UTF-8?q?feat(REQ-3581)=20-=20=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E7=94=A8=E5=8D=B0=E7=9B=B8=E5=85=B3=E6=8C=89=E9=92=AE=E5=8F=AA?= =?UTF-8?q?=E6=9C=89=E5=8F=91=E8=B5=B7=E4=BA=BA=E8=83=BD=E4=BD=BF=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/axzo/nanopart/visa/server/service/VisaHelper.java | 2 +- .../server/service/impl/ChangeRecordConfirmServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/VisaHelper.java b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/VisaHelper.java index e3d955f4..04e757be 100644 --- a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/VisaHelper.java +++ b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/VisaHelper.java @@ -322,7 +322,7 @@ public class VisaHelper { ChangeRecord changeRecord = visaIdMap.get(key); if (Objects.nonNull(changeRecord) && Objects.nonNull(changeRecord.getStatus())) { Set buttons = VisaButtonTypeEnum.fetchBtnsByBizTypeAndStatusWhenPage(value, changeRecord.getStatus()); - if (Objects.equals(changeRecord.getStatus(), VisaStatusEnum.COMPLETED)) { + if (Objects.equals(changeRecord.getStatus(), VisaStatusEnum.COMPLETED) && value.contains(VisaConfirmBizTypeEnum.CREATE)) { switch (changeRecord.getStampStatus()) { case UNPRINTED: buttons.add(VisaButtonTypeEnum.REQUEST_STAMP); diff --git a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordConfirmServiceImpl.java b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordConfirmServiceImpl.java index 846a25d4..e549c780 100644 --- a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordConfirmServiceImpl.java +++ b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/service/impl/ChangeRecordConfirmServiceImpl.java @@ -159,7 +159,7 @@ public class ChangeRecordConfirmServiceImpl extends ServiceImpl Date: Thu, 6 Mar 2025 10:30:05 +0800 Subject: [PATCH 2/2] =?UTF-8?q?feat(REQ-3581)=20-=20=E5=85=BC=E5=AE=B9?= =?UTF-8?q?=E5=AE=A1=E6=89=B9=E6=93=8D=E4=BD=9C=E4=BA=BA=E6=9C=AA=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../workflow/process/ProcessInstanceOfEssAllEventHandler.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/mq/listener/workflow/process/ProcessInstanceOfEssAllEventHandler.java b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/mq/listener/workflow/process/ProcessInstanceOfEssAllEventHandler.java index 9a669fb6..b39f0943 100644 --- a/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/mq/listener/workflow/process/ProcessInstanceOfEssAllEventHandler.java +++ b/visa/visa-server/src/main/java/cn/axzo/nanopart/visa/server/mq/listener/workflow/process/ProcessInstanceOfEssAllEventHandler.java @@ -17,6 +17,7 @@ import cn.axzo.workflow.starter.handler.ProcessInstanceEventHandler; import com.alibaba.fastjson.JSON; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; +import org.springframework.util.StringUtils; import java.util.List; import java.util.Objects; @@ -93,8 +94,9 @@ public class ProcessInstanceOfEssAllEventHandler extends BasicLogSupport impleme log.info("change process instance of ess: {}, instance result: {}", dto.getProcessInstanceId(), dto.getType().getTag()); Long visaId = Long.valueOf(dto.getBusinessKey()); Long operatorId = Optional.ofNullable(dto.getLastOperationAssigner()) + .filter(e -> StringUtils.hasText(e.getPersonId())) .map(e -> Long.valueOf(e.getPersonId())) - .orElse(null); + .orElse(0L); List essInstances = changeRecordRelationService.findByCondition(VisaRelationDto.builder() .visaId(visaId) .varName(VisaRelationFieldEnum.PROCESS_INSTANCE_OF_ESS.name())