From 87df18def393a248c75fa4c0c6fc65d5eac8f6ac Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Wed, 2 Dec 2020 16:35:46 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=9B=E5=85=A5=E7=BD=91=E6=A0=BC(enterGrid)?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=A2=9E=E5=8A=A0=E8=BF=94=E5=8F=82userStree?=
 =?UTF-8?q?tName(=E6=A0=BC=E5=BC=8F:=20XX=E8=B7=AF-X=E5=85=88=E7=94=9F/?=
 =?UTF-8?q?=E5=A5=B3=E5=A3=AB)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/dto/result/UserInfoOnEnterGridResultDTO.java    | 4 ++++
 .../com/epmet/service/impl/RegisterRelationServiceImpl.java   | 1 +
 2 files changed, 5 insertions(+)

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 3779e68a24..0e5cd22fef 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
@@ -50,4 +50,8 @@ public class UserInfoOnEnterGridResultDTO implements Serializable{
      * */
     private List<String> userRoleList;
 
+    /**
+     *
+     */
+    private String userStreetName;
 }
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 06d33d7d93..7b9edb95a5 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
@@ -304,6 +304,7 @@ public class RegisterRelationServiceImpl extends BaseServiceImpl<RegisterRelatio
         userResiInfoDao.selectUserResiInfoDTO(userResiParam);
         if(null == resiResult){
             visitedFormDTO.setIsReg(NumConstant.ZERO_STR);
+            resultObj.setUserStreetName(resiResult.getShowName());
         }else{
             visitedFormDTO.setIsReg(NumConstant.ONE_STR);
         }