From 3958b5d0f870cefdb73fbf7c48f2460fb243e142 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Wed, 28 Apr 2021 09:45:47 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=9B=E5=85=A5=E7=BD=91=E6=A0=BC=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E6=B7=BB=E5=8A=A0=E7=9C=9F=E5=AE=9E=E4=BA=BA=E5=90=8D?=
 =?UTF-8?q?=E8=BF=94=E5=8F=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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 0e5cd22fef..0bada1c5ee 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
@@ -51,7 +51,11 @@ public class UserInfoOnEnterGridResultDTO implements Serializable{
     private List<String> userRoleList;
 
     /**
-     *
+     * XX街道-Y先生/女士   如果是未认证居民，这一列为空
      */
     private String userStreetName;
+    /**
+     * XX街道-YYY  如果是未认证居民，这一列为空
+     */
+    private String userStreetTrueName;
 }
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 8c6c448689..e2aaae2963 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
@@ -273,6 +273,7 @@ public class RegisterRelationServiceImpl extends BaseServiceImpl<RegisterRelatio
         visitedFormDTO.setUserId(enterGridFormDTO.getUserId());
         visitedFormDTO.setIsReg(NumConstant.ZERO_STR);
         resultObj.setUserStreetName(StrConstant.EPMETY_STR);
+        resultObj.setUserStreetTrueName(StrConstant.EPMETY_STR);
         if (strangerInfo != null){
             if (StringUtils.isNotBlank(strangerInfo.getStreet()) && StringUtils.isNotBlank(strangerInfo.getSurname())){
                 String gender = null;
@@ -284,7 +285,9 @@ public class RegisterRelationServiceImpl extends BaseServiceImpl<RegisterRelatio
                     gender = UserConstant.MAN_WOMAN;
                 }
                 String leaderName = strangerInfo.getStreet().concat(StrConstant.HYPHEN).concat(strangerInfo.getSurname()).concat(gender);
+                String userStreetTrueName = strangerInfo.getStreet().concat(StrConstant.HYPHEN).concat(strangerInfo.getSurname()).concat(strangerInfo.getName());
                 resultObj.setUserStreetName(leaderName);
+                resultObj.setUserStreetTrueName(userStreetTrueName);
                 visitedFormDTO.setIsReg(NumConstant.ONE_STR);
             }
         }