From 49a3afb505f78560b78d8bafa85e4ffd5f411e9d Mon Sep 17 00:00:00 2001
From: xy <748613696@qq.com>
Date: Tue, 3 Dec 2024 16:25:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E6=8E=A5=E7=BA=BF=E6=96=B9?=
 =?UTF-8?q?=E5=BC=8F=E5=8F=96=E6=8C=87=E6=A0=87=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/service/impl/SysDicTreePOServiceImpl.java | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/SysDicTreePOServiceImpl.java b/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/SysDicTreePOServiceImpl.java
index 2de64e287..1bdec388a 100644
--- a/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/SysDicTreePOServiceImpl.java
+++ b/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/SysDicTreePOServiceImpl.java
@@ -191,14 +191,18 @@ public class SysDicTreePOServiceImpl extends ServiceImpl<SysDicTreePOMapper, Sys
         }
         //通用指标
         else {
-            //角型接线
-            if (Objects.equals(conType,1)) {
+            //0-星型接线
+            if (Objects.equals(conType,0)) {
                 queryWrapper.in(SysDicTreePO::getType, Arrays.asList(2,4));
             }
-            //其他接线方式
-            else {
+            //1-角型接线
+            else if (Objects.equals(conType,1)) {
                 queryWrapper.in(SysDicTreePO::getType,Arrays.asList(2,5));
             }
+            //2-V型接线
+            else if (Objects.equals(conType,2)) {
+                queryWrapper.in(SysDicTreePO::getType,Arrays.asList(2,5,6));
+            }
         }
         return this.list(queryWrapper);
     }