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 @@ avatar, + + tenant_id, + balance, @@ -106,6 +109,9 @@ #{avatar}, + + #{tenantId}, + #{balance}, @@ -241,6 +247,9 @@ user_type, + + tenant_id, + open_id, @@ -295,12 +304,11 @@ - \ No newline at end of file +