From 8b482e436bd714c1e8e1d3529ba4b7ed6019e3e9 Mon Sep 17 00:00:00 2001
From: syc <asda>
Date: Tue, 9 Aug 2022 13:35:23 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A8=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../partymember/PartymemberRegisterRelationDTO.java    | 10 ++++++++++
 .../entity/PartymemberRegisterRelationEntity.java      | 10 ++++++++++
 .../main/java/com/epmet/dto/RegisterRelationDTO.java   | 10 ++++++++++
 .../java/com/epmet/entity/RegisterRelationEntity.java  | 10 ++++++++++
 4 files changed, 40 insertions(+)

diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/PartymemberRegisterRelationDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/PartymemberRegisterRelationDTO.java
index 35ebdcbb38..c2716ea00b 100644
--- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/PartymemberRegisterRelationDTO.java
+++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/PartymemberRegisterRelationDTO.java
@@ -44,6 +44,16 @@ public class PartymemberRegisterRelationDTO implements Serializable {
      */
 	private String customerId;
 
+    /**
+     * 所属组织机构Id
+     */
+    private String agencyId;
+
+    /**
+     * agencyId的所有上级，包含自己
+     */
+    private String agencyIdPath;
+
     /**
      * 网格Id (customer_grid.id)
      */
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/entity/PartymemberRegisterRelationEntity.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/entity/PartymemberRegisterRelationEntity.java
index 07aa0380ff..360131ca94 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/entity/PartymemberRegisterRelationEntity.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/entity/PartymemberRegisterRelationEntity.java
@@ -40,6 +40,16 @@ public class PartymemberRegisterRelationEntity extends BaseEpmetEntity {
      */
 	private String customerId;
 
+	/**
+	 * 所属组织机构Id
+	 */
+	private String agencyId;
+
+	/**
+	 * agencyId的所有上级，包含自己
+	 */
+	private String agencyIdPath;
+
     /**
      * 网格Id (customer_grid.id)
      */
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/RegisterRelationDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/RegisterRelationDTO.java
index 0cc3ea4019..165651b81b 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/RegisterRelationDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/RegisterRelationDTO.java
@@ -44,6 +44,16 @@ public class RegisterRelationDTO implements Serializable {
      */
 	private String customerId;
 
+    /**
+     * 所属组织机构Id
+     */
+    private String agencyId;
+
+    /**
+     * agencyId的所有上级，包含自己
+     */
+    private String agencyIdPath;
+
     /**
      * 用户Id (user.id)
      */
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/RegisterRelationEntity.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/RegisterRelationEntity.java
index ba4ff82087..2548d9b2ac 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/RegisterRelationEntity.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/entity/RegisterRelationEntity.java
@@ -40,6 +40,16 @@ public class RegisterRelationEntity extends BaseEpmetEntity {
      */
 	private String customerId;
 
+	/**
+	 * 所属组织机构Id
+	 */
+	private String agencyId;
+
+	/**
+	 * agencyId的所有上级，包含自己
+	 */
+	private String agencyIdPath;
+
     /**
      * 用户Id (user.id)
      */