From 3496f93c862de6a028af20db76e794b865ab1a03 Mon Sep 17 00:00:00 2001
From: xuyang <748613696@qq.com>
Date: Fri, 12 Jan 2024 15:56:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B2=B3=E5=8C=97=E8=B6=85=E9=AB=98=E5=8E=8B?=
 =?UTF-8?q?=E7=AE=97=E6=B3=95=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/upload/impl/REvaluationDataServiceImpl.java        | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/REvaluationDataServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/REvaluationDataServiceImpl.java
index e3ef320b1..4112a358f 100644
--- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/REvaluationDataServiceImpl.java
+++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/upload/impl/REvaluationDataServiceImpl.java
@@ -126,6 +126,8 @@ public class REvaluationDataServiceImpl extends ServiceImpl<RUploadEvaluationDat
                 }
                 if (Objects.equals(item.getVoltageLevel(),"0")){
                     item.setVoltageLevel(null);
+                } else {
+                    item.setVoltageLevel(getVoltage(item.getVoltageLevel()));
                 }
                 if (Objects.equals(item.getCityId(),"")){
                     item.setCityId(null);
@@ -136,7 +138,6 @@ public class REvaluationDataServiceImpl extends ServiceImpl<RUploadEvaluationDat
                 BigDecimal four = BigDecimal.valueOf(item.getMonitorBusRate());
                 double value = four.setScale(4,BigDecimal.ROUND_HALF_UP).doubleValue();
                 item.setMonitorBusRate(value);
-                item.setVoltageLevel(getVoltage(item.getVoltageLevel()));
             }).collect(Collectors.toList());
             //组装数据
             SendParam sp = new SendParam();