From 166f0c23804e196d9314d005c9cf3aa48855d9cd Mon Sep 17 00:00:00 2001
From: wr <1754607820@qq.com>
Date: Thu, 4 Sep 2025 11:04:40 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83=E4=BA=8C=E7=BA=A7=E8=AF=84?=
 =?UTF-8?q?=E4=BC=B0=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../assess/impl/SecondaryEvaluationServiceImpl.java        | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/assess/impl/SecondaryEvaluationServiceImpl.java b/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/assess/impl/SecondaryEvaluationServiceImpl.java
index 24d5e3e32..104943f88 100644
--- a/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/assess/impl/SecondaryEvaluationServiceImpl.java
+++ b/pqs-advance/advance-boot/src/main/java/com/njcn/advance/service/assess/impl/SecondaryEvaluationServiceImpl.java
@@ -314,9 +314,6 @@ public class SecondaryEvaluationServiceImpl implements SecondaryEvaluationServic
         /************************************电压波动算法**********************************/
         //非风电场取冲击负荷最大的哪个
         List<AssessShockLoadParam> assessShockLoadParams = iAssessShockLoadParamService.lambdaQuery().eq(AssessShockLoadParam::getAssessId, assessId).list();
-        if (CollUtil.isEmpty(assessShockLoadParams)) {
-            throw new BusinessException("冲击负荷参数缺失");
-        }
         assessShockLoadParams.forEach(temp -> {
             AssessDicShockLoad byId = iAssessDicShockLoadService.getById(temp.getInpactloadtypeId());
             if (Objects.isNull(byId)) {
@@ -345,7 +342,6 @@ public class SecondaryEvaluationServiceImpl implements SecondaryEvaluationServic
                     un.doubleValue(),
                     false);
         } else if (Objects.equals(isWindfarm, "03")) {
-
             dMax = VoltageFluctuationUtil.calculateImpactLoadVoltageFluctuation(assessShockLoadParam.getInpactloadPower().doubleValue(),
                     assessShockLoadParam.getInpactloadMultiple().doubleValue(), scc);
         } else {
@@ -357,6 +353,9 @@ public class SecondaryEvaluationServiceImpl implements SecondaryEvaluationServic
         Double plt;
         if (Objects.equals(isWindfarm, "01")) {
             List<AssessWindLoadParam> assessWindLoadParams = iAssessWindLoadParamService.lambdaQuery().eq(AssessWindLoadParam::getAssessId, assessId).list();
+            if (Objects.isNull(assessWindLoadParams)) {
+                throw new BusinessException("风电参数缺失");
+            }
             List<VoltageFlickerUtil.WindFarmLoads> windFarmLoadsList = assessWindLoadParams.stream().map(temp -> {
                 VoltageFlickerUtil.WindFarmLoads windFarmLoads = new VoltageFlickerUtil.WindFarmLoads();
                 windFarmLoads.setFlickerCoefficient(temp.getFlickerCoeff().doubleValue());