Merge remote-tracking branch 'origin/dev_question_naire' into dev_question_naire

# Conflicts:
#	epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/form/TDuckListFormDTO.java

@@ -0,0 +1,37 @@
+package com.epmet.dataaggre.dto.epmettduck.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2021/9/17 10:47 上午
+ * @DESC
+ */
+@Data
+public class TDuckListFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 3624352114576287768L;
+
+    public interface TDuckListForm{}
+
+    /**
+     * 1：未发布，2：收集中，3：已结束
+     */
+    @NotNull(message = "问卷调查状态不能为空",groups = TDuckListForm.class)
+    private Integer status;
+
+    @NotNull(message = "pageNo不能为空",groups = TDuckListForm.class)
+    private Integer pageNo;
+
+    @NotNull(message = "pageSize不能为空",groups = TDuckListForm.class)
+    private Integer pageSize;
+
+    @NotBlank(message = "orgIds不能为空",groups = TDuckListForm.class)
+    private String orgIds;
+
+    private String userId;
+}

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/epmettduck/result/TDuckListResultDTO.java

@@ -0,0 +1,96 @@
+package com.epmet.dataaggre.dto.epmettduck.result;
+
+import com.epmet.commons.tools.constant.NumConstant;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+
+/**
+ * @Author zxc
+ * @DateTime 2021/9/17 10:47 上午
+ * @DESC
+ */
+@Data
+public class TDuckListResultDTO implements Serializable {
+
+    private static final long serialVersionUID = 3624352114576287768L;
+
+    /**
+     * 客户id
+     */
+    private String customerId;
+
+    /**
+     * 项目code
+     */
+    private String key;
+
+    /**
+     * 来源Id
+     */
+    private String sourceId;
+
+    /**
+     * 来源类型
+     */
+    private Integer sourceType;
+
+    /**
+     * 项目名称
+     */
+    private String name;
+
+    /**
+     * 项目描述
+     */
+    private String describe;
+
+    /**
+     * 用户ID
+     */
+    private String userId;
+
+    /**
+     * 项目类型
+     */
+    private Integer type;
+
+    /**
+     * 状态
+     */
+    private Integer status;
+
+    /**
+     * 适用于哪个端 resi：居民端用户；gov：工作端用户；运营端用户：oper
+     */
+    private String client;
+
+    private String createdTime;
+
+    /**
+     * 是否填写问卷，true：是，false：否
+     */
+    private Boolean fillStatus;
+
+    /**
+     * 回收状态 0:未回收；1已回收
+     */
+    private Integer recycled;
+
+    public TDuckListResultDTO() {
+        this.customerId = "";
+        this.key = "";
+        this.sourceId = "";
+        this.sourceType = NumConstant.ONE;
+        this.name = "";
+        this.describe = "";
+        this.userId = "";
+        this.type = NumConstant.ONE;
+        this.status = NumConstant.ONE;
+        this.client = "";
+        this.createdTime = "";
+        this.fillStatus = false;
+    }
+}

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/form/SubOrgFormDTO.java

@@ -15,6 +15,10 @@ public class SubOrgFormDTO implements Serializable {
     private static final long serialVersionUID = -3651225675593357002L;
     @NotBlank(message = "组织ID不能为空")
     private String agencyId;
+    /**
+     * 所属端 居民端resi，工作端gov
+     */
+    private String client;
     /**
      * 是否包括我（1 是，0 否）
      */

epmet-module/data-aggregator/data-aggregator-client/src/main/java/com/epmet/dataaggre/dto/govorg/result/OrgTreeResultDTO.java

@@ -0,0 +1,21 @@
+package com.epmet.dataaggre.dto.govorg.result;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @Description
+ * @Author zhaoqifeng
+ * @Date 2021/9/16 16:50
+ */
+@Data
+public class OrgTreeResultDTO implements Serializable {
+    private static final long serialVersionUID = -4304356050545598564L;
+    private String orgId;
+    private String orgName;
+    private String orgType;
+    private String orgPids;
+    private List<OrgTreeResultDTO>  subOrgList;
+}

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/EpmetTDuckController.java

@@ -2,9 +2,14 @@ package com.epmet.dataaggre.controller;
 
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.epmet.commons.tools.annotation.LoginUser;
+import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.dataaggre.dto.epmettduck.form.TDuckDetailFormDTO;
+import com.epmet.dataaggre.dto.epmettduck.form.TDuckListFormDTO;
+import com.epmet.dataaggre.dto.epmettduck.result.TDuckListResultDTO;
+import com.epmet.dataaggre.entity.epmettduck.PrUserProjectEntity;
 import com.epmet.dataaggre.entity.epmettduck.PrUserProjectItemEntity;
 import com.epmet.dataaggre.service.epmettduck.PrUserProjectItemService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -75,4 +80,11 @@ public class EpmetTDuckController {
     }
 
 
+    @PostMapping("list")
+    public Result<List<TDuckListResultDTO>> queryProjectList(@RequestBody TDuckListFormDTO formDTO,@LoginUser TokenDto tokenDto){
+        ValidatorUtils.validateEntity(formDTO,TDuckListFormDTO.TDuckListForm.class);
+        formDTO.setUserId(tokenDto.getUserId());
+        return new Result<List<TDuckListResultDTO>>().ok(prUserProjectService.queryProjectList(formDTO));
+    }
+
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/controller/GovOrgController.java

@@ -165,4 +165,18 @@ public class GovOrgController {
         return new Result<SubOrgResultDTO>().ok(govOrgService.getSubOrg(formDTO));
     }
 
+    /**
+     * @Description 当前组织级下级组织树
+     * @Param tokenDto
+     * @Param formDTO
+     * @Return {@link Result< OrgTreeResultDTO>}
+     * @Author zhaoqifeng
+     * @Date 2021/9/17 14:02
+     */
+    @PostMapping("agencytree")
+    public Result<OrgTreeResultDTO> getAgencyTree(@LoginUser TokenDto tokenDto, @RequestBody SubOrgFormDTO formDTO) {
+        ValidatorUtils.validateEntity(formDTO);
+        return new Result<OrgTreeResultDTO>().ok(govOrgService.getAgencyTree(tokenDto, formDTO));
+    }
+
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrUserProjectDao.java

@@ -3,9 +3,11 @@ package com.epmet.dataaggre.dao.epmettduck;
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dataaggre.dto.epmettduck.result.AnalysisReportResDTO;
 import com.epmet.dataaggre.dto.epmettduck.result.ProjectProfileResultDTO;
+import com.epmet.dataaggre.dto.epmettduck.result.TDuckListResultDTO;
 import com.epmet.dataaggre.entity.epmettduck.PrUserProjectEntity;
 import com.epmet.dataaggre.entity.epmettduck.PrUserProjectResultEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -46,4 +48,20 @@ public interface PrUserProjectDao extends BaseDao<PrUserProjectEntity> {
      * @date 2021/9/16 6:18 下午
      */
     List<PrUserProjectResultEntity> selectResults(String projectKey);
+
+    /**
+     * @Description  查询范围内的问卷调查
+     * @Param orgId
+     * @author zxc
+     * @date 2021/9/17 2:16 下午
+     */
+    List<String> selectProjectKey(@Param("orgIds")String orgIds);
+
+    /**
+     * @Description  根据keys查询project
+     * @Param keys
+     * @author zxc
+     * @date 2021/9/17 3:41 下午
+     */
+    List<TDuckListResultDTO> queryProjectList(@Param("keys")List<String> keys, @Param("status")Integer status);
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/epmettduck/PrVistRecordDao.java

@@ -3,6 +3,9 @@ package com.epmet.dataaggre.dao.epmettduck;
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dataaggre.entity.epmettduck.PrVistRecordEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 /**
  * 用户访问问卷记录表
@@ -13,4 +16,6 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface PrVistRecordDao extends BaseDao<PrVistRecordEntity> {
 
+    List<String> selectVisitRecordByUserId(@Param("userId")String userId);
+
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/dao/govorg/CustomerAgencyDao.java

@@ -18,10 +18,7 @@
 package com.epmet.dataaggre.dao.govorg;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
-import com.epmet.dataaggre.dto.govorg.result.AgencyGridResultDTO;
+import com.epmet.dataaggre.dto.govorg.result.*;
-import com.epmet.dataaggre.dto.govorg.result.StaffAgencyGridListResultDTO;
-import com.epmet.dataaggre.dto.govorg.result.StaffOrgNameResultDTO;
-import com.epmet.dataaggre.dto.govorg.result.StaffOrgRelationResultDTO;
 import com.epmet.dataaggre.entity.govorg.CustomerAgencyEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -74,4 +71,10 @@ public interface CustomerAgencyDao extends BaseDao<CustomerAgencyEntity> {
      * @return
      */
     StaffOrgRelationResultDTO getStaffFromOrgType(@Param("staffId") String staffId);
+
+    OrgTreeResultDTO getOrgTree(@Param("agencyId") String agencyId);
+    List<OrgTreeResultDTO> getSubOrgList(@Param("pid") String pid);
+
+    OrgTreeResultDTO getResiOrgTree(@Param("agencyId") String agencyId);
+    List<OrgTreeResultDTO> getResiSubOrgList(@Param("pid") String pid);
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/PrUserProjectService.java

@@ -20,8 +20,10 @@ package com.epmet.dataaggre.service.epmettduck;
 import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.dataaggre.dto.epmettduck.PrUserProjectDTO;
+import com.epmet.dataaggre.dto.epmettduck.form.TDuckListFormDTO;
 import com.epmet.dataaggre.dto.epmettduck.result.AnalysisReportResDTO;
 import com.epmet.dataaggre.dto.epmettduck.result.ProjectProfileResultDTO;
+import com.epmet.dataaggre.dto.epmettduck.result.TDuckListResultDTO;
 import com.epmet.dataaggre.entity.epmettduck.PrUserProjectEntity;
 
 import java.util.List;
@@ -105,6 +107,8 @@ public interface PrUserProjectService extends BaseService<PrUserProjectEntity> {
      */
     ProjectProfileResultDTO queryProjectProfile(String projectKey);
 
+    List<TDuckListResultDTO> queryProjectList(TDuckListFormDTO formDTO);
+
     /**
      * 分析报告
      *

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/epmettduck/impl/PrUserProjectServiceImpl.java

@@ -32,12 +32,8 @@ import com.epmet.dataaggre.dao.epmettduck.PrUserProjectDao;
 import com.epmet.dataaggre.dto.epmettduck.PrUserProjectDTO;
 import com.epmet.dataaggre.dto.epmettduck.ProjectItemTypeEnum;
 import com.epmet.dataaggre.dto.epmettduck.result.AnalysisReportResDTO;
-import com.epmet.dataaggre.dto.epmettduck.result.OptionDTO;
 import com.epmet.dataaggre.dto.epmettduck.result.ProjectProfileResultDTO;
-import com.epmet.dataaggre.dto.epmettduck.struct.CheckboxExpandStruct;
-import com.epmet.dataaggre.dto.epmettduck.struct.RadioExpandStruct;
 import com.epmet.dataaggre.dto.epmettduck.struct.RateExpandStruct;
-import com.epmet.dataaggre.dto.epmettduck.struct.SelectExpandStruct;
 import com.epmet.dataaggre.entity.epmettduck.PrUserProjectEntity;
 import com.epmet.dataaggre.entity.epmettduck.PrUserProjectResultEntity;
 import com.epmet.dataaggre.service.epmettduck.PrUserProjectService;
@@ -63,6 +59,9 @@ import java.util.stream.Stream;
 @Service
 public class PrUserProjectServiceImpl extends BaseServiceImpl<PrUserProjectDao, PrUserProjectEntity> implements PrUserProjectService {
 
+    @Autowired
+    private PrVistRecordDao visitRecordDao;
+
     @Override
     public PageData<PrUserProjectDTO> page(Map<String, Object> params) {
         IPage<PrUserProjectEntity> page = baseDao.selectPage(
@@ -128,6 +127,29 @@ public class PrUserProjectServiceImpl extends BaseServiceImpl<PrUserProjectDao,
         return baseDao.queryProjectProfile(projectKey);
     }
 
+
+    @Override
+    public List<TDuckListResultDTO> queryProjectList(TDuckListFormDTO formDTO) {
+        List<String> projectKeys = baseDao.selectProjectKey(formDTO.getOrgIds());
+        if (CollectionUtils.isEmpty(projectKeys)){
+            return new ArrayList<>();
+        }
+        PageInfo<TDuckListResultDTO> projectPageInfo = PageHelper.startPage(formDTO.getPageNo(), formDTO.getPageSize()).doSelectPageInfo(() -> baseDao.queryProjectList(projectKeys, formDTO.getStatus()));
+        List<TDuckListResultDTO> result = projectPageInfo.getList();
+        List<String> records = visitRecordDao.selectVisitRecordByUserId(formDTO.getUserId());
+        if (!CollectionUtils.isEmpty(records)){
+            for (String r : records) {
+                for (TDuckListResultDTO t : result) {
+                    if (r.equals(t.getKey())){
+                        t.setFillStatus(true);
+                        continue;
+                    }
+                }
+            }
+        }
+        return result;
+    }
+
     /**
      * 分析报告
      *

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/GovOrgService.java

@@ -135,4 +135,14 @@ public interface GovOrgService {
      * @return
      */
     StaffOrgRelationResultDTO getStaffFromOrgType(String staffId);
+
+    /**
+     * @Description 当前组织级下级组织树
+     * @Param tokenDto
+     * @Param formDTO
+     * @Return {@link OrgTreeResultDTO}
+     * @Author zhaoqifeng
+     * @Date 2021/9/17 14:03
+     */
+    OrgTreeResultDTO getAgencyTree(TokenDto tokenDto, SubOrgFormDTO formDTO);
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/java/com/epmet/dataaggre/service/govorg/impl/GovOrgServiceImpl.java

@@ -491,4 +491,22 @@ public class GovOrgServiceImpl implements GovOrgService {
         return customerAgencyDao.getStaffFromOrgType(staffId);
     }
 
+    /**
+     * @param tokenDto
+     * @param formDTO
+     * @Description 当前组织级下级组织树
+     * @Param tokenDto
+     * @Param formDTO
+     * @Return {@link OrgTreeResultDTO}
+     * @Author zhaoqifeng
+     * @Date 2021/9/17 14:03
+     */
+    @Override
+    public OrgTreeResultDTO getAgencyTree(TokenDto tokenDto, SubOrgFormDTO formDTO) {
+        if ("resi".equals(formDTO.getClient())) {
+            return customerAgencyDao.getResiOrgTree(formDTO.getAgencyId());
+        }
+        return customerAgencyDao.getOrgTree(formDTO.getAgencyId());
+    }
+
 }

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrUserProjectDao.xml

@@ -47,4 +47,26 @@
           and m.project_key=#{projectKey}
         order by m.serial_number asc
     </select>
+
+    <!-- 查询范围内的问卷调查 -->
+    <select id="selectProjectKey" resultType="java.lang.String">
+        SELECT
+            DISTINCT project_key
+        FROM pr_publish_range
+        WHERE del_flag = 0
+          AND #{orgIds} LIKE CONCAT(org_ids,'%')
+    </select>
+
+    <!-- 根据keys查询project -->
+    <select id="queryProjectList" resultType="com.epmet.dataaggre.dto.epmettduck.result.TDuckListResultDTO">
+        select * from pr_user_project
+        where del_flag = 0
+        AND status = #{status}
+        AND `key` in (
+            <foreach collection="keys" item="key" separator=",">
+                #{key}
+            </foreach>
+            )
+        ORDER BY created_time DESC
+    </select>
 </mapper>

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/epmettduck/PrVistRecordDao.xml

@@ -3,4 +3,10 @@
 
 <mapper namespace="com.epmet.dataaggre.dao.epmettduck.PrVistRecordDao">
 
+    <!-- 根据userId查询是否已填 -->
+    <select id="selectVisitRecordByUserId" resultType="java.lang.String">
+        SELECT project_key FROM pr_vist_record
+        WHERE del_flag = 0
+          AND user_id = #{userId}
+    </select>
 </mapper>

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govorg/CustomerAgencyDao.xml

@@ -142,4 +142,125 @@
         SELECT STAFF_ID,ORG_ID,ORG_TYPE FROM staff_org_relation WHERE del_flag = '0' AND staff_id = #{staffId}
     </select>
 
+
+    <resultMap id="BaseResultMap" type="com.epmet.dataaggre.dto.govorg.result.OrgTreeResultDTO">
+        <result column="orgId" property="orgId"/>
+        <result column="orgName" property="orgName"/>
+        <result column="orgType" property="orgType"/>
+        <result column="orgPids" property="orgPids"/>
+    </resultMap>
+    <resultMap id="NodeTreeResult" type="com.epmet.dataaggre.dto.govorg.result.OrgTreeResultDTO"
+               extends="BaseResultMap">
+        <collection property="subOrgList" column="orgId" ofType="com.epmet.dataaggre.dto.govorg.result.OrgTreeResultDTO"
+                    javaType="java.util.ArrayList" select="getSubOrgList">
+        </collection>
+    </resultMap>
+
+    <select id="getSubOrgList" resultMap="NodeTreeResult">
+        SELECT
+            *
+        FROM
+            (
+            SELECT
+                ID AS orgId,
+                ORGANIZATION_NAME AS orgName,
+                'agency' AS orgType,
+                CONCAT( PIDS, ID ) AS orgPids
+            FROM
+                customer_agency a
+            WHERE
+                DEL_FLAG = 0
+                AND PID = #{pid} UNION
+            SELECT
+                cd.ID AS orgId,
+                DEPARTMENT_NAME AS orgName,
+                'dept' AS orgType,
+                CONCAT( PIDS, ca.ID, cd.ID ) AS orgPids
+            FROM
+                customer_department cd
+                INNER JOIN customer_agency ca ON cd.AGENCY_ID = ca.ID
+            WHERE
+                cd.DEL_FLAG = 0
+                AND cd.AGENCY_ID = #{pid} UNION
+            SELECT
+                ID AS orgId,
+                GRID_NAME AS orgName,
+                'grid' AS orgType,
+                CONCAT( PIDS, ID ) AS orgPids
+            FROM
+                customer_grid
+            WHERE
+                DEL_FLAG = 0
+                AND PID = #{pid}
+            ) a
+        ORDER BY
+            orgType,
+            orgId
+    </select>
+    <select id="getOrgTree" resultMap="NodeTreeResult">
+        select
+            ID AS orgId,
+            ORGANIZATION_NAME AS orgName,
+            'agency' AS orgName,
+            CONCAT(PIDS,ID) AS orgPids
+
+        from
+            customer_agency
+        where
+             DEL_FLAG = 0
+            AND ID = #{agencyId}
+    </select>
+
+
+    <resultMap id="ResiNodeTreeResult" type="com.epmet.dataaggre.dto.govorg.result.OrgTreeResultDTO"
+               extends="BaseResultMap">
+        <collection property="subOrgList" column="orgId" ofType="com.epmet.dataaggre.dto.govorg.result.OrgTreeResultDTO"
+                    javaType="java.util.ArrayList" select="getResiSubOrgList">
+        </collection>
+    </resultMap>
+
+    <select id="getResiSubOrgList" resultMap="ResiNodeTreeResult">
+            SELECT
+            *
+        FROM
+            (
+            SELECT
+                ID AS orgId,
+                ORGANIZATION_NAME AS orgName,
+                'agency' AS orgType,
+                CONCAT( PIDS, ID ) AS orgPids
+            FROM
+                customer_agency a
+            WHERE
+                DEL_FLAG = 0
+                AND PID = #{pid} UNION
+            SELECT
+                ID AS orgId,
+                GRID_NAME AS orgName,
+                'grid' AS orgType,
+                CONCAT( PIDS, ID ) AS orgPids
+            FROM
+                customer_grid
+            WHERE
+                DEL_FLAG = 0
+                AND PID = #{pid}
+            ) a
+        ORDER BY
+            orgType,
+            orgId
+    </select>
+    <select id="getResiOrgTree" resultMap="ResiNodeTreeResult">
+        select
+            ID AS orgId,
+            ORGANIZATION_NAME AS orgName,
+            'agency' AS orgName,
+            CONCAT(PIDS,ID) AS orgPids
+
+        from
+            customer_agency
+        where
+             DEL_FLAG = 0
+            AND ID = #{agencyId}
+    </select>
+
 </mapper>

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 = "";
 }

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 = "";
     //人员注册时所属组织名【组织-组织，组织-部门，组织-网格】

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();