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