From 685089b88a493712746b8cc16f6de9bd72551795 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 22 Sep 2021 12:46:01 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E5=85=85=E7=BA=A7=E8=81=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dataaggre/dto/epmettduck/struct/CascaderExpandStruct.java | 4 ++++
 .../service/epmettduck/impl/PrUserProjectServiceImpl.java     | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/CascaderExpandStruct.java b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/CascaderExpandStruct.java
index c572f882af..7961fdbf5d 100644
--- a/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/CascaderExpandStruct.java
+++ b/epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/struct/CascaderExpandStruct.java
@@ -41,6 +41,10 @@ public class CascaderExpandStruct {
         public Integer id;
         public String label;
         public String value;
+        /**
+         * 莹姐加了这个参数
+         */
+        public String pid;
         public List<Option> children;
     }
 }
diff --git a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java
index 2d7f422212..c1bcf57deb 100644
--- a/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java
+++ b/epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java
@@ -366,7 +366,7 @@ public class PrUserProjectServiceImpl extends BaseServiceImpl<PrUserProjectDao,
                 continue;
             }
 
-            //3.4级联
+            //3.4级联  todo
             if(ProjectItemTypeEnum.CASCADER.getValue().equals(currentType)){
                 //目前cascaderExpandStruct 没啥用
                 CascaderExpandStruct cascaderExpandStruct = JSON.parseObject(item.getExpand(), CascaderExpandStruct.class);