From 5f2aaf5a5570c6fb3830d87aea19b2a2617a4669 Mon Sep 17 00:00:00 2001
From: wangyu <727842003@qq.com>
Date: Sat, 11 Dec 2021 00:11:47 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E9=A2=9D=E5=A4=96=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E5=AE=A1=E6=A0=B8=E6=A0=87=E8=AE=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../flyfish/framework/approval/domain/ApprovalDomainVo.java   | 2 +-
 .../framework/approval/domain/record/ApproveRecordListVo.java | 4 +++-
 .../framework/approval/service/ModuleDelegateService.java     | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/flyfish-approval/src/main/java/com/flyfish/framework/approval/domain/ApprovalDomainVo.java b/flyfish-approval/src/main/java/com/flyfish/framework/approval/domain/ApprovalDomainVo.java
index d2a5b21..908052a 100644
--- a/flyfish-approval/src/main/java/com/flyfish/framework/approval/domain/ApprovalDomainVo.java
+++ b/flyfish-approval/src/main/java/com/flyfish/framework/approval/domain/ApprovalDomainVo.java
@@ -27,7 +27,7 @@ public abstract class ApprovalDomainVo<T extends ApprovalDomain> implements Vo<T
                 .orElse(ApproveStatus.DRAFT.getName()));
         this.setApproveStatus(Optional.ofNullable(po.getApproveStatus()).map(ApproveStatus::name)
                 .orElse(ApproveStatus.DRAFT.name()));
-        if (po.getNext() != -1) {
+        if (null != po.getNext() && po.getNext() != -1) {
             this.setNextApprover(po.getApprovers().get(po.getNext()));
         }
         return this;
diff --git a/flyfish-approval/src/main/java/com/flyfish/framework/approval/domain/record/ApproveRecordListVo.java b/flyfish-approval/src/main/java/com/flyfish/framework/approval/domain/record/ApproveRecordListVo.java
index 0dc87e4..f2805ab 100644
--- a/flyfish-approval/src/main/java/com/flyfish/framework/approval/domain/record/ApproveRecordListVo.java
+++ b/flyfish-approval/src/main/java/com/flyfish/framework/approval/domain/record/ApproveRecordListVo.java
@@ -1,10 +1,12 @@
 package com.flyfish.framework.approval.domain.record;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.flyfish.framework.approval.enums.ApproveAction;
 import com.flyfish.framework.domain.base.Vo;
 import lombok.Data;
 
 import java.util.Date;
+import java.util.Optional;
 
 /**
  * 审批记录列表vo
@@ -34,7 +36,7 @@ public class ApproveRecordListVo implements Vo<ApproveRecord> {
         vo.setName(po.getName());
         vo.setApprover(po.getModifier());
         vo.setApproveTime(po.getModifyTime());
-        vo.setAction(po.getAction().getName());
+        vo.setAction(Optional.ofNullable(po.getAction()).map(ApproveAction::getName).orElse(null));
         vo.setOpinion(po.getOpinion());
         return vo;
     }
diff --git a/flyfish-approval/src/main/java/com/flyfish/framework/approval/service/ModuleDelegateService.java b/flyfish-approval/src/main/java/com/flyfish/framework/approval/service/ModuleDelegateService.java
index 1f7df72..2de9342 100644
--- a/flyfish-approval/src/main/java/com/flyfish/framework/approval/service/ModuleDelegateService.java
+++ b/flyfish-approval/src/main/java/com/flyfish/framework/approval/service/ModuleDelegateService.java
@@ -158,7 +158,8 @@ public class ModuleDelegateService {
         BaseReactiveService<ApprovalDomain> service = getService(data.getModule());
         return service.getById(data.getId())
                 .flatMap(domain -> {
-                    if (ApproveStatus.DRAFT != domain.getApproveStatus() && ApproveStatus.REJECTED != domain.getApproveStatus()) {
+                    ApproveStatus status = domain.getApproveStatus();
+                    if (null != status && ApproveStatus.DRAFT != status && ApproveStatus.REJECTED != status) {
                         return Mono.error(new InvalidBusinessException("该数据已经提交审批，请勿重复提交！"));
                     }
                     domain.setApprovers(data.getApprovers());