From 59cb39ee83d237f9793eead998ea18c0737ead93 Mon Sep 17 00:00:00 2001
From: OTTO <731554297@qq.com>
Date: Mon, 9 Dec 2024 15:51:29 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E9=A1=B9=E7=9B=AE=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E4=BA=A7=E5=93=81=E9=9C=80=E6=B1=82=E9=87=8D=E6=9E=84):=20?=
 =?UTF-8?q?=E5=AE=8C=E5=96=84=E4=BA=A7=E5=93=81=E4=B8=AD=E7=9A=84=E9=9C=80?=
 =?UTF-8?q?=E6=B1=82=E8=A7=84=E6=A0=BC=E5=8A=9F=E8=83=BD=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修复需规评审相关信息不存在导致报错的问题

Signed-off-by: OTTO <731554297@qq.com>
---
 .../pms/product/domain/enums/ProductReqReviewStatus.java        | 2 +-
 .../product/service/impl/PmsProductRequirementServiceImpl.java  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/product/domain/enums/ProductReqReviewStatus.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/product/domain/enums/ProductReqReviewStatus.java
index dd125eb72..0258efae8 100644
--- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/product/domain/enums/ProductReqReviewStatus.java
+++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/product/domain/enums/ProductReqReviewStatus.java
@@ -10,7 +10,7 @@ import lombok.Getter;
 @Getter
 public enum ProductReqReviewStatus {
     PASS("pass", "已通过"),
-    REJECTED("rejected", "已拒绝");
+    REJECTED("rejected", "未通过");
     private final String key;
     private final String name;
 
diff --git a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/product/service/impl/PmsProductRequirementServiceImpl.java b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/product/service/impl/PmsProductRequirementServiceImpl.java
index 920d874c0..c19bd9d74 100644
--- a/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/product/service/impl/PmsProductRequirementServiceImpl.java
+++ b/microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/product/service/impl/PmsProductRequirementServiceImpl.java
@@ -622,7 +622,7 @@ public class PmsProductRequirementServiceImpl implements IPmsProductRequirementS
             if (record != null) {
                 break;
             }
-            fromReq = selectPmsProductRequirementById(fromReq.getFromId(), true);
+            fromReq = fromReq.getFromId() != null ? selectPmsProductRequirementById(fromReq.getFromId(), true) : null;
         }
         if (record != null) {
             productReqSpecsDetailVo.setReviewTime(record.getOperatingTime());