From af654ba49ce372510e32eddd7261f7a5c783357b Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Thu, 1 Apr 2021 14:49:05 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=96=E6=8C=82=E6=8E=A5=E5=8F=A3=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E8=BF=94=E5=8F=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/result/ExtUserInfoResultDTO.java      | 25 +++++++++++++++++++
 .../service/impl/UserBaseInfoServiceImpl.java |  5 ++++
 2 files changed, 30 insertions(+)

diff --git a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/ExtUserInfoResultDTO.java b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/ExtUserInfoResultDTO.java
index 01f9ee8cf8..21beb87aed 100644
--- a/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/ExtUserInfoResultDTO.java
+++ b/epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/result/ExtUserInfoResultDTO.java
@@ -90,6 +90,31 @@ public class ExtUserInfoResultDTO implements Serializable {
      */
     private String gender = "";
 
+    /**
+     * 街道
+     */
+    private String street;
+
+    /**
+     * 小区名称
+     */
+    private String district;
+
+    /**
+     * 楼栋单元
+     */
+    private String buildingAddress;
+
+    /**
+     * 身份证号
+     */
+    private String idNum;
+
+    /**
+     * 显示昵称 xx网格-y先生/女士
+     * */
+    private String showName;
+
 
     /**
      * 用户角色列表
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java
index f3a77c85fe..42a5152325 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBaseInfoServiceImpl.java
@@ -377,6 +377,11 @@ public class UserBaseInfoServiceImpl extends BaseServiceImpl<UserBaseInfoDao, Us
             result.setProfile(userMsg.getHeadImgUrl());
             result.setNickname(userMsg.getNickname());
             result.setRealName(userMsg.getRealName());
+            result.setStreet(userMsg.getStreet());
+            result.setDistrict(userMsg.getDistrict());
+            result.setBuildingAddress(userMsg.getBuildingAddress());
+            result.setIdNum(userMsg.getIdNum());
+            result.setShowName(userMsg.getShowName());
             // 2020.11.24 sun  start
             result.setMobile(StringUtils.isNotBlank(userMsg.getMobile()) ? userMsg.getMobile() : "");
             List<UserWechatEntity> list = userWechatDao.selectByUserId(param.getUserId());