From 1075a72375891be472c8421b1eff6737f59207ea Mon Sep 17 00:00:00 2001
From: caozehui <2427765068@qq.com>
Date: Sat, 8 Mar 2025 17:51:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/PqScriptDtlsServiceImpl.java    | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/detection/src/main/java/com/njcn/gather/script/service/impl/PqScriptDtlsServiceImpl.java b/detection/src/main/java/com/njcn/gather/script/service/impl/PqScriptDtlsServiceImpl.java
index 8d3f3f3d..5c5656aa 100644
--- a/detection/src/main/java/com/njcn/gather/script/service/impl/PqScriptDtlsServiceImpl.java
+++ b/detection/src/main/java/com/njcn/gather/script/service/impl/PqScriptDtlsServiceImpl.java
@@ -143,16 +143,14 @@ public class PqScriptDtlsServiceImpl extends ServiceImpl<PqScriptDtlsMapper, PqS
             //额定电流信息
             currSet = devTypes.stream().map(DevType::getDevCurr).collect(Collectors.toSet());
         } else {
-            if (ObjectUtil.isNull(param.getType())) {
+            if (param.getType() == 0) {
                 voltSet.add(1.0);
                 currSet.add(1.0);
                 param.setIsPhaseSequence("-1");
-            }else {
-                if (param.getType() == 1) {
-                    voltSet.add(57.74);
-                    currSet.add(5.0);
-                    param.setIsPhaseSequence("-1");
-                }
+            } else if (param.getType() == 1) {
+                voltSet.add(57.74);
+                currSet.add(5.0);
+                param.setIsPhaseSequence("-1");
             }
         }
 
@@ -831,11 +829,11 @@ public class PqScriptDtlsServiceImpl extends ServiceImpl<PqScriptDtlsMapper, PqS
             //先获取检测脚本类型是否相对值  true相对值 false绝对值（相对值要乘额定值,绝对值不需要处理)
             queryWrapper.eq(PqScriptDtls::getScriptId, param.getScriptId());
             pqScriptDtls = this.getBaseMapper().selectJoinList(PqScriptDtls.class, queryWrapper);
-            if (CollUtil.isNotEmpty(param.getDevIds()) || (ObjectUtil.isNotNull(param.getType())&&param.getType()==1)) {
+            if (CollUtil.isNotEmpty(param.getDevIds()) || (ObjectUtil.isNotNull(param.getType()) && param.getType() == 1)) {
                 Boolean isValueType;
                 if (ObjectUtil.isNotNull(param.getValueType()) && param.getValueType() == 2) {
                     isValueType = true; //相对值脚本
-                }else {
+                } else {
                     isValueType = pqScriptMapper.selectScriptIsValueType(param.getScriptId());
                 }
                 if (isValueType) {