From 02a53288ce0f105403c6d05437baf3df842a6679 Mon Sep 17 00:00:00 2001
From: yuyang <YU930814yang>
Date: Fri, 31 Dec 2021 11:22:22 +0800
Subject: [PATCH] =?UTF-8?q?Token=E5=A2=9E=E5=8A=A0=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E5=92=8CopenId?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/xhpc/common/security/service/TokenService.java    | 2 ++
 .../com/xhpc/user/service/impl/XhpcAppUserServiceImpl.java     | 1 +
 .../xhpc-user/src/main/resources/mapper/XhpcCommonMapper.xml   | 3 +++
 3 files changed, 6 insertions(+)

diff --git a/ruoyi-common/ruoyi-common-security/src/main/java/com/xhpc/common/security/service/TokenService.java b/ruoyi-common/ruoyi-common-security/src/main/java/com/xhpc/common/security/service/TokenService.java
index e1bee54e..392a3c19 100644
--- a/ruoyi-common/ruoyi-common-security/src/main/java/com/xhpc/common/security/service/TokenService.java
+++ b/ruoyi-common/ruoyi-common-security/src/main/java/com/xhpc/common/security/service/TokenService.java
@@ -44,6 +44,8 @@ public class TokenService {
         loginUser.setUsername(loginUser.getSysUser().getUserName());
         loginUser.setIpaddr(IpUtils.getIpAddr(ServletUtils.getRequest()));
         loginUser.setTenantId(loginUser.getTenantId());
+        loginUser.setUserType(loginUser.getUserType());
+        loginUser.setOpenId(loginUser.getOpenId());
         refreshToken(loginUser);
 
         // 保存或更新用户token
diff --git a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/impl/XhpcAppUserServiceImpl.java b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/impl/XhpcAppUserServiceImpl.java
index 016f1682..b750fabb 100644
--- a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/impl/XhpcAppUserServiceImpl.java
+++ b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/service/impl/XhpcAppUserServiceImpl.java
@@ -232,6 +232,7 @@ public class XhpcAppUserServiceImpl implements IXhpcAppUserUserService {
                 userInfo.setSysUser(sysUser);
                 userInfo.setUsername(username);
                 userInfo.setOpenId(openid);
+                userInfo.setTenantId(map.get("tenantId").toString());
                 if(UserTypeUtil.COMMUNIT.equals(username.substring(0,2))){
                     userInfo.setUserType(UserTypeUtil.COMMUNIT_TYPE);
                 }else{
diff --git a/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcCommonMapper.xml b/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcCommonMapper.xml
index 3ce93bd9..8ee46909 100644
--- a/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcCommonMapper.xml
+++ b/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcCommonMapper.xml
@@ -22,6 +22,7 @@
                alipay_login as alipayLogin,
                del_flag delFlag,
                concat(0) as userType,
+               tenant_id tenantId,
                create_time as createTime
         from xhpc_app_user
         where del_flag=0
@@ -48,6 +49,7 @@
             alipay_open_id as alipayLogin,
             weixin_login as weixinOpenId,
             alipay_login as alipayLogin,
+            tenant_id tenantId,
             del_flag delFlag,
             concat(2) as userType,
         <if test="serialNumber !=null and serialNumber !=''">
@@ -80,6 +82,7 @@
             weixin_login as weixinOpenId,
             alipay_login as alipayLogin,
             del_flag delFlag,
+            tenant_id tenantId,
             concat(3) as userType,
          <if test="serialNumber !=null and serialNumber !=''">
              (select count(charging_station_id) from xhpc_mechanism where customers_id=mechanism_id and source=1 and charging_station_id in (select charging_station_id from xhpc_terminal where 1=1 and del_flag=0 and serial_number=#{serialNumber})) as number,