From b3e99acf4a733914ad7eb1ae88173fe178e00438 Mon Sep 17 00:00:00 2001
From: YUJT <work@yujt.net.cn>
Date: Wed, 25 May 2022 09:56:48 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AE=80=E5=8C=96=E5=85=9A=E7=BB=84=E7=BB=87?=
 =?UTF-8?q?=E6=A0=91=E8=BF=94=E5=9B=9E=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../partyOrg/result/IcPartyOrgTreeDTO.java    | 32 -------------------
 .../service/impl/IcPartyOrgServiceImpl.java   |  2 +-
 .../mapper/partyOrg/IcPartyOrgDao.xml         | 11 +------
 3 files changed, 2 insertions(+), 43 deletions(-)

diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/IcPartyOrgTreeDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/IcPartyOrgTreeDTO.java
index 35d7372bc9..cb5bf1b927 100644
--- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/IcPartyOrgTreeDTO.java
+++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partyOrg/result/IcPartyOrgTreeDTO.java
@@ -28,12 +28,6 @@ public class IcPartyOrgTreeDTO implements Serializable {
      */
     private String pid;
 
-
-    /**
-     * 党组织的上级ID,没有上级时为0
-     */
-	private String orgPid;
-
     /**
      * 党组织的所有上级ID,没有上级时为0
      */
@@ -59,32 +53,6 @@ public class IcPartyOrgTreeDTO implements Serializable {
      */
 	private String partyOrgName;
 
-    /**
-     * 组织编码
-     */
-	private String partyOrgCode;
-
-    /**
-     * 经度
-     */
-	private String longitude;
-
-    /**
-     * 纬度
-     */
-	private String latitude;
-
-    /**
-     * 地址
-     */
-	private String address;
-
-    /**
-     * 党组织介绍
-     */
-	private String introduction;
-
-
     private List<IcPartyOrgTreeDTO> children = new ArrayList<>();
 
 
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyOrgServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyOrgServiceImpl.java
index 3a6ecee63a..61795fd090 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyOrgServiceImpl.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partyOrg/service/impl/IcPartyOrgServiceImpl.java
@@ -163,7 +163,7 @@ public class IcPartyOrgServiceImpl extends BaseServiceImpl<IcPartyOrgDao, IcPart
         }
 
         for(IcPartyOrgTreeDTO node : nodeMap.values()) {
-            IcPartyOrgTreeDTO parent = nodeMap.get(node.getOrgPid());
+            IcPartyOrgTreeDTO parent = nodeMap.get(node.getPid());
             if(parent != null && !(node.getId().equals(parent.getId()))){
                 parent.getChildren().add(node);
                 continue;
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyOrgDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyOrgDao.xml
index b02c13d85a..6e8071fab8 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyOrgDao.xml
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partyOrg/IcPartyOrgDao.xml
@@ -27,21 +27,12 @@
     <select id="getTreelist" resultType="com.epmet.resi.partymember.dto.partyOrg.result.IcPartyOrgTreeDTO">
         select  ID,
 				CUSTOMER_ID,
-				ORG_PID,
 				ORG_PID as pid,
 				ORG_PIDS,
 				AGENCY_ID,
 				AGENCY_PIDS,
 				PARTY_ORG_TYPE,
-				PARTY_ORG_NAME,
-				PARTY_ORG_CODE,
-				INTRODUCTION,
-				DEL_FLAG,
-				REVISION,
-				CREATED_BY,
-				CREATED_TIME,
-				UPDATED_BY,
-				UPDATED_TIME
+				PARTY_ORG_NAME
         from ic_party_org
         where DEL_FLAG=0
               and CUSTOMER_ID=#{customerId}