From 2c183e152090b4624a4b25d709aae9366739a356 Mon Sep 17 00:00:00 2001
From: zzy <zhong.zy@bsoft.com.cn>
Date: Sat, 25 Apr 2026 22:38:52 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dal/dataobject/memberhouse/MemberHouseDO.java   |  6 ++++--
 .../service/memberhouse/MemberHouseServiceImpl.java | 13 +++++++++++--
 .../service/user/MemberUserServiceImpl.java         |  6 +++---
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/dal/dataobject/memberhouse/MemberHouseDO.java b/fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/dal/dataobject/memberhouse/MemberHouseDO.java
index 87953bd..a4e3c9a 100644
--- a/fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/dal/dataobject/memberhouse/MemberHouseDO.java
+++ b/fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/dal/dataobject/memberhouse/MemberHouseDO.java
@@ -3,7 +3,8 @@ package com.fjrcloud.community.module.community.dal.dataobject.memberhouse;
 import com.baomidou.mybatisplus.annotation.KeySequence;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import com.fjrcloud.community.framework.tenant.core.db.TenantBaseDO;
+import com.fjrcloud.community.framework.mybatis.core.dataobject.BaseDO;
+import com.fjrcloud.community.framework.tenant.core.aop.TenantIgnore;
 import lombok.*;
 
 import java.time.LocalDate;
@@ -22,7 +23,8 @@ import java.time.LocalDateTime;
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-public class MemberHouseDO extends TenantBaseDO {
+@TenantIgnore
+public class MemberHouseDO extends BaseDO {
 
     /**
      * 主键ID
diff --git a/fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/service/memberhouse/MemberHouseServiceImpl.java b/fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/service/memberhouse/MemberHouseServiceImpl.java
index f448038..fdf3d8e 100644
--- a/fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/service/memberhouse/MemberHouseServiceImpl.java
+++ b/fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/service/memberhouse/MemberHouseServiceImpl.java
@@ -37,6 +37,7 @@ import java.util.Map;
 import java.util.stream.Collectors;
 
 import static com.fjrcloud.community.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static com.fjrcloud.community.framework.tenant.core.security.TenantSecurityWebFilter.SYSTEM_TENANT_ID;
 import static com.fjrcloud.community.module.community.enums.ErrorCodeConstants.*;
 import static com.fjrcloud.community.module.community.enums.MemberErrorCodeConstants.USER_MOBILE_NOT_EXISTS;
 import static com.fjrcloud.community.module.system.enums.oauth2.OAuth2ClientConstants.CLIENT_ID_DEFAULT;
@@ -99,7 +100,6 @@ public class MemberHouseServiceImpl implements MemberHouseService {
 
         // 4. 插入数据
         MemberHouseDO memberHouse = BeanUtils.toBean(createReqVO, MemberHouseDO.class);
-        memberHouse.setTenantId(createReqVO.getCommunityId());
         memberHouseMapper.insert(memberHouse);
 
         // 5. 将用户关联到该小区（租户），如果是第一个小区则设为默认
@@ -206,6 +206,16 @@ public class MemberHouseServiceImpl implements MemberHouseService {
 
     @Override
     public PageResult<MemberHouseDO> getMemberHousePage(MemberHousePageReqVO pageReqVO) {
+
+        Long tenantId = TenantContextHolder.getTenantId();
+
+        if (pageReqVO.getCommunityId() == null) {
+            if (SYSTEM_TENANT_ID.equals(tenantId)) {
+                return TenantUtils.executeIgnore(() -> memberHouseMapper.selectPage(pageReqVO));
+            }
+            pageReqVO.setCommunityId(tenantId);
+        }
+
         return memberHouseMapper.selectPage(pageReqVO);
     }
 
@@ -294,7 +304,6 @@ public class MemberHouseServiceImpl implements MemberHouseService {
         MemberHouseDO memberHouse = BeanUtils.toBean(createReqVO, MemberHouseDO.class);
         memberHouse.setMemberId(memberId);
         memberHouse.setStatus(0);
-        memberHouse.setTenantId(createReqVO.getCommunityId());
         memberHouseMapper.insert(memberHouse);
 
         // 4. 将用户关联到该小区（租户），如果是第一个小区则设为默认
diff --git a/fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/service/user/MemberUserServiceImpl.java b/fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/service/user/MemberUserServiceImpl.java
index b9c0dee..e151803 100644
--- a/fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/service/user/MemberUserServiceImpl.java
+++ b/fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/service/user/MemberUserServiceImpl.java
@@ -148,9 +148,9 @@ public class MemberUserServiceImpl implements MemberUserService {
         }
 
         Long tenantId = TenantContextHolder.getTenantId();
-        if(user.getCurrentCommunityId() != null){
-            tenantId = user.getCurrentCommunityId();
-        }
+//        if(user.getCurrentCommunityId() != null){
+//            tenantId = user.getCurrentCommunityId();
+//        }
 
         // 如果用户有当前小区ID，则获取该小区的默认房屋信息
         if (tenantId != null) {