zzy
/
fjrcloud-community
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

接口优化

master
zzy 2026-04-25 22:38:52 +08:00
parent 8cc31a621a
commit 2c183e1520
3 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/dal/dataobject/memberhouse/MemberHouseDO.java
View File

@ -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

13
fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/service/memberhouse/MemberHouseServiceImpl.java
View File

@ -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. 将用户关联到该小区（租户），如果是第一个小区则设为默认

6
fjrcloud-module-community/src/main/java/com/fjrcloud/community/module/community/service/user/MemberUserServiceImpl.java
View File

@ -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) {