From ea0bafb0ec97ce2f6cd8d9157c02f046b50f8ef8 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Tue, 24 Nov 2020 16:51:33 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=96=E6=8C=82=E6=8E=A5=E5=8F=A3=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=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/ExtUserInfoResultDTO.java     |  6 +++---
 .../com/epmet/dto/result/UserBaseInfoResultDTO.java    |  5 -----
 .../epmet/service/impl/UserBaseInfoServiceImpl.java    | 10 ++++++----
 .../src/main/resources/mapper/UserBaseInfoDao.xml      |  3 +--
 4 files changed, 10 insertions(+), 14 deletions(-)

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 36500de794..01f9ee8cf8 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
@@ -78,17 +78,17 @@ public class ExtUserInfoResultDTO implements Serializable {
     /**
      * 手机号(注册手机号)
      */
-    private String mobile;
+    private String mobile = "";
 
     /**
      * 用户微信openId
      * */
-    private String wxOpenId;
+    private String wxOpenId = "";
 
     /**
      * 性别（1男2女0未知）
      */
-    private String gender;
+    private String gender = "";
 
 
     /**
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserBaseInfoResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserBaseInfoResultDTO.java
index 919a357771..c674685ee5 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserBaseInfoResultDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserBaseInfoResultDTO.java
@@ -97,11 +97,6 @@ public class UserBaseInfoResultDTO implements Serializable {
      * */
     private String showName;
 
-    /**
-     * 用户微信openId
-     * */
-    private String wxOpenId;
-
     /**
      * 微信基本信息
      */
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 bb2c90b569..d2d411bafd 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
@@ -34,6 +34,7 @@ import com.epmet.dto.form.ResiVolunteerAuthenticateFormDTO;
 import com.epmet.dto.form.UserRoleFormDTO;
 import com.epmet.dto.result.*;
 import com.epmet.entity.UserBaseInfoEntity;
+import com.epmet.entity.UserWechatEntity;
 import com.epmet.feign.GovOrgOpenFeignClient;
 import com.epmet.redis.UserBaseInfoRedis;
 import com.epmet.resi.partymember.dto.partymember.PartymemberInfoDTO;
@@ -74,8 +75,6 @@ public class UserBaseInfoServiceImpl extends BaseServiceImpl<UserBaseInfoDao, Us
     private GridLatestDao gridLatestDao;
     @Autowired
     private GovOrgOpenFeignClient govOrgOpenFeignClient;
-    @Autowired
-    private UserBaseInfoDao userBaseInfoDao;
 
     @Override
     public PageData<UserBaseInfoDTO> page(Map<String, Object> params) {
@@ -323,7 +322,7 @@ public class UserBaseInfoServiceImpl extends BaseServiceImpl<UserBaseInfoDao, Us
         result.setUserId(param.getUserId());
         //2020.11.24 sun 对外接口添加一个手机号返参和openId，因openId不在缓存中因此不在走缓存，直接掉sql查询  start
         //UserBaseInfoResultDTO userMsg = userBaseInfoRedis.getUserInfo(param.getUserId());
-        UserBaseInfoResultDTO userMsg = userBaseInfoDao.selectListByUserIdList(param.getUserId());
+        UserBaseInfoResultDTO userMsg = baseDao.selectListByUserIdList(param.getUserId());
         // end
         if(null != userMsg) {
             result.setProfile(userMsg.getHeadImgUrl());
@@ -331,7 +330,10 @@ public class UserBaseInfoServiceImpl extends BaseServiceImpl<UserBaseInfoDao, Us
             result.setRealName(userMsg.getRealName());
             // 2020.11.24 sun  start
             result.setMobile(StringUtils.isNotBlank(userMsg.getMobile()) ? userMsg.getMobile() : "");
-            result.setWxOpenId(StringUtils.isNotBlank(userMsg.getWxOpenId()) ? userMsg.getWxOpenId() : "");
+            List<UserWechatEntity> list = userWechatDao.selectByUserId(param.getUserId());
+            if (list.size() > NumConstant.ZERO) {
+                result.setWxOpenId(StringUtils.isNotBlank(list.get(NumConstant.ZERO).getWxOpenId()) ? list.get(NumConstant.ZERO).getWxOpenId() : "");
+            }
             result.setGender(StringUtils.isNotBlank(userMsg.getGender()) ? userMsg.getGender() : "");
             //end
         }else{
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/UserBaseInfoDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/UserBaseInfoDao.xml
index 4c69f90542..cc86f83ccd 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/UserBaseInfoDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/UserBaseInfoDao.xml
@@ -40,8 +40,7 @@
         ubi.DISTRICT,
         ubi.BUILDING_ADDRESS,
         wechat.NICKNAME,
-        wechat.HEAD_IMG_URL,
-        wechat.WX_OPEN_ID AS "wxOpenId"
+        wechat.HEAD_IMG_URL
     FROM
         user_wechat wechat
         LEFT JOIN user_base_info ubi ON wechat.USER_ID = ubi.USER_ID