From 883b1730c98b6c330a05864d28556df63df96e1c Mon Sep 17 00:00:00 2001
From: ZZ <coml_aaron@163.com>
Date: Fri, 31 Dec 2021 14:54:06 +0800
Subject: [PATCH] =?UTF-8?q?Dao=E5=88=87=E9=9D=A2=E5=8A=A0=E5=85=A5tenantId?=
 =?UTF-8?q?=E5=B1=9E=E6=80=A7,=E6=9D=A5=E8=87=AAtoken?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/xhpc/user/aspect/UserDaoAspect.java   |  4 +---
 .../resources/mapper/XhpcAppUserMapper.xml    | 22 +++++++++++++------
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/aspect/UserDaoAspect.java b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/aspect/UserDaoAspect.java
index f5bc302c..a4e76cdd 100644
--- a/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/aspect/UserDaoAspect.java
+++ b/xhpc-modules/xhpc-user/src/main/java/com/xhpc/user/aspect/UserDaoAspect.java
@@ -120,9 +120,7 @@ public class UserDaoAspect {
                         BeanUtils.setProperty(arg, UPDATE_TIME, date);
                     }
 
-                    if (isProperty(arg, TENANT_ID) && StringUtils.isEmpty(BeanUtils.getProperty(arg, TENANT_ID))) {
-                        BeanUtils.setProperty(arg, TENANT_ID, date);
-                    }
+                    BeanUtils.setProperty(arg, TENANT_ID, loginUser.getTenantId());
                 }
             }
         } catch (Exception e) {
diff --git a/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcAppUserMapper.xml b/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcAppUserMapper.xml
index cbebfca9..763961c4 100644
--- a/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcAppUserMapper.xml
+++ b/xhpc-modules/xhpc-user/src/main/resources/mapper/XhpcAppUserMapper.xml
@@ -50,6 +50,9 @@
             <if test="null != avatar and '' != avatar">
                 avatar,
             </if>
+            <if test="null != tenantId ">
+                tenant_id,
+            </if>
             <if test="null != balance and '' != balance">
                 balance,
             </if>
@@ -106,6 +109,9 @@
             <if test="null != avatar and '' != avatar">
                 #{avatar},
             </if>
+            <if test="null != tenantId and '' != tenantId">
+                #{tenantId},
+            </if>
             <if test="null != balance and '' != balance">
                 #{balance},
             </if>
@@ -241,6 +247,9 @@
             <if test="null != userType ">
                 user_type,
             </if>
+            <if test="null != tenantId ">
+                tenant_id,
+            </if>
             <if test="null != openId and '' != openId">
                 open_id,
             </if>
@@ -295,12 +304,11 @@
     </update>
 
     <select id="getUserLoginTime" resultType="map">
-        select
-               app_user_id as appUserId,
-               account as account,
-               user_type as userType,
-               open_id as openId,
-               status as status
+        select app_user_id as appUserId,
+               account     as account,
+               user_type   as userType,
+               open_id     as openId,
+               status      as status
         from xhpc_user_login type=#{type} and open_id=#{openid}
     </select>
-</mapper> 
\ No newline at end of file
+</mapper>