From 41f3eff2cd0251c3b575cb755cef8926ee11cc37 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Tue, 21 Jun 2022 16:48:37 +0800
Subject: [PATCH] pid

---
 .../com/epmet/commons/tools/dto/result/OptionResultDTO.java    | 2 +-
 .../java/com/epmet/service/impl/CustomerGridServiceImpl.java   | 1 +
 .../src/main/resources/mapper/CustomerGridDao.xml              | 3 ++-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/result/OptionResultDTO.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/result/OptionResultDTO.java
index fa96252e3b..562e1933fa 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/result/OptionResultDTO.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/dto/result/OptionResultDTO.java
@@ -23,7 +23,7 @@ public class OptionResultDTO implements Serializable {
     private List<OptionResultDTO> children;
     private Boolean usableFlag;
     private String type;
-
+    private String pid;
 
     /**
      * desc:递归获取当前节点的 所有子节点
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java
index 5e7aa468ff..431200b560 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerGridServiceImpl.java
@@ -922,6 +922,7 @@ public class CustomerGridServiceImpl extends BaseServiceImpl<CustomerGridDao, Cu
             OptionResultDTO dto = new OptionResultDTO();
             dto.setLabel(item.getGridName());
             dto.setValue(item.getId());
+            dto.setPid(item.getPid());
             return dto;
         }).collect(Collectors.toList());
     }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
index e428bc42c6..757fcbcf04 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml
@@ -733,7 +733,8 @@
             case when ca.ORGANIZATION_NAME is null or ca.ORGANIZATION_NAME='' then cg.GRID_NAME
             else concat(ca.ORGANIZATION_NAME,'-',cg.GRID_NAME)
             end
-            )as label
+            )as label,
+            cg.PID
         from customer_grid cg
             left join customer_agency ca
         on(cg.PID=ca.id and ca.DEL_FLAG='0')