Dao切面加入tenantId属性,来自token

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, loginUser.getTenantId());
-                        BeanUtils.setProperty(arg, TENANT_ID, date);
-                    }
                 }
             }
         } catch (Exception e) {

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,8 +304,7 @@
     </update>
 
     <select id="getUserLoginTime" resultType="map">
-        select
+        select app_user_id as appUserId,
-               app_user_id as appUserId,
                account     as account,
                user_type   as userType,
                open_id     as openId,