From 382dc4bc5a75cebabeee9187d57587bf52f0930c Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Fri, 17 Sep 2021 15:55:43 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=BA=E5=90=8D=E8=BF=94?=
 =?UTF-8?q?=E5=8F=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/dto/result/MineResultDTO.java   | 6 ++++++
 .../com/epmet/dto/result/UserInfoOnEnterGridResultDTO.java  | 2 ++
 .../com/epmet/service/impl/RegisterRelationServiceImpl.java | 1 +
 3 files changed, 9 insertions(+)

diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/MineResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/MineResultDTO.java
index 01b1630ebc..2e3adc0e89 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/MineResultDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/MineResultDTO.java
@@ -63,4 +63,10 @@ public class MineResultDTO implements Serializable {
      * 根组织名
      */
     private String rootAgencyName;
+	//工作人员添加入口Id(agencyId;deptId;gridId)
+	private String orgId = "";
+	//人员注册时所属组织名【组织-组织，组织-部门，组织-网格】
+	private String orgName = "";
+	//工作人员添加入口类型(组织:agency;部门:dept;网格:gridId)
+	private String orgType = "";
 }
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserInfoOnEnterGridResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserInfoOnEnterGridResultDTO.java
index 64f790c115..3561cb4060 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserInfoOnEnterGridResultDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserInfoOnEnterGridResultDTO.java
@@ -59,6 +59,8 @@ public class UserInfoOnEnterGridResultDTO implements Serializable{
      */
     private String userStreetTrueName;
 
+    //真实姓名
+    private String realName;
     //工作人员添加入口Id(agencyId;deptId;gridId)
     private String orgId = "";
     //人员注册时所属组织名【组织-组织，组织-部门，组织-网格】
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RegisterRelationServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RegisterRelationServiceImpl.java
index efafe3a963..2d1a9df160 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RegisterRelationServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RegisterRelationServiceImpl.java
@@ -158,6 +158,7 @@ public class RegisterRelationServiceImpl extends BaseServiceImpl<RegisterRelatio
         if(null != strangerInfo){
             resultObj.setNickname(strangerInfo.getNickname());
             resultObj.setUserHeadPhoto(strangerInfo.getHeadImgUrl());
+            resultObj.setRealName(null == strangerInfo.getRealName() ? "" : strangerInfo.getRealName());
         }
         //需要新增的用户关系参数
         UserCustomerEntity userCustomer = new UserCustomerEntity();