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()) 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