From d4222083e543c029248d92b13194bcdc050c24bb Mon Sep 17 00:00:00 2001
From: hzj <826100833@qq.com>
Date: Mon, 22 Jan 2024 09:30:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B2=BB=E7=90=86bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PqTypicalSourceCreatePOServiceImpl.java    | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/send/impl/PqTypicalSourceCreatePOServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/send/impl/PqTypicalSourceCreatePOServiceImpl.java
index 864f48e9a..c8d662af2 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/send/impl/PqTypicalSourceCreatePOServiceImpl.java
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/send/impl/PqTypicalSourceCreatePOServiceImpl.java
@@ -148,20 +148,22 @@ public class PqTypicalSourceCreatePOServiceImpl extends ServiceImpl<PqTypicalSou
                 }else if(temp.equals(DicDataEnum.OTHER_INTERFERENCESOURCE_USERS.getCode())) {
                     List<String> idList = other_interferencesource_users_dict.stream().map(SysDicTreePO::getId).collect(Collectors.toList());
                     tempList = monitorList.stream().filter(tempmonitor -> idList.contains(tempmonitor.getObjType())).collect(Collectors.toList());
+                    pqTypicalSourceCreatePO.setIndustryType("05");
 
                 }
 
                 if(CollectionUtils.isEmpty(tempList)){
                     return;
-                }else {
-                    //不需要赋值电站等级
-                    if (mapVoltage.containsKey(tempList.get(0).getVoltageLevel())) {
-//                        pqTypicalSourceCreatePO.setVoltageLevel(String.format("%02d", mapVoltage.get(tempList.get(0).getVoltageLevel()).getAlgoDescribe()));
-                        //默认给05
-                        pqTypicalSourceCreatePO.setIndustryType("05");
-                    }
-
                 }
+//                else {
+//                    //不需要赋值电站等级
+//                    if (mapVoltage.containsKey(tempList.get(0).getVoltageLevel())) {
+//                        pqTypicalSourceCreatePO.setVoltageLevel(String.format("%02d", mapVoltage.get(tempList.get(0).getVoltageLevel()).getAlgoDescribe()));
+//                        //默认给05
+//                        pqTypicalSourceCreatePO.setIndustryType("05");
+//                    }
+//
+//                }
                 List<String> monitorIds = tempList.stream().map(Monitor::getId).collect(Collectors.toList());
                 //站内有效监测点数量
                 Integer effectiveMonitorNum;