From 995766f64acfd203230a76be021079c23a4dc800 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Wed, 15 Jul 2020 13:52:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=AC=E4=BC=97=E5=8F=B7=E6=8E=88=E6=9D=83?=
 =?UTF-8?q?=E6=8D=A2=E5=8F=96token?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/service/impl/PublicUserLoginServiceImpl.java    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/epmet-auth/src/main/java/com/epmet/service/impl/PublicUserLoginServiceImpl.java b/epmet-auth/src/main/java/com/epmet/service/impl/PublicUserLoginServiceImpl.java
index 972d9cc831..a9b9703cbd 100644
--- a/epmet-auth/src/main/java/com/epmet/service/impl/PublicUserLoginServiceImpl.java
+++ b/epmet-auth/src/main/java/com/epmet/service/impl/PublicUserLoginServiceImpl.java
@@ -121,8 +121,10 @@ public class PublicUserLoginServiceImpl implements PublicUserLoginService {
     private void saveLatestGovTokenDto(SaveUserResultDTO resultDTO, WxMpUser wxMpUser, String token) {
         TokenDto tokenDTO = new TokenDto();
         int expire = jwtTokenProperties.getExpire();
+        tokenDTO.setApp(LoginConstant.APP_PUBLIC);
+        tokenDTO.setClient(LoginConstant.CLIENT_MP);
         tokenDTO.setOpenId(wxMpUser.getOpenId());
-        tokenDTO.setUnionId(wxMpUser.getUnionId());
+        tokenDTO.setUnionId(null == wxMpUser.getUnionId() ? "" : wxMpUser.getUnionId());
         tokenDTO.setToken(token);
         //首次初始化时还没有客户
         tokenDTO.setCustomerId("");