|
@@ -24,6 +24,7 @@ import org.dromara.common.core.utils.MapstructUtils;
|
|
|
import org.dromara.common.core.utils.StringUtils;
|
|
import org.dromara.common.core.utils.StringUtils;
|
|
|
import org.dromara.common.mybatis.core.page.PageQuery;
|
|
import org.dromara.common.mybatis.core.page.PageQuery;
|
|
|
import org.dromara.common.mybatis.core.page.TableDataInfo;
|
|
import org.dromara.common.mybatis.core.page.TableDataInfo;
|
|
|
|
|
+import org.dromara.common.tenant.helper.TenantHelper;
|
|
|
import org.springframework.cache.annotation.CacheEvict;
|
|
import org.springframework.cache.annotation.CacheEvict;
|
|
|
import org.springframework.cache.annotation.Cacheable;
|
|
import org.springframework.cache.annotation.Cacheable;
|
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
@@ -57,8 +58,8 @@ public class PtRoomServiceImpl implements IPtRoomService {
|
|
|
@Override
|
|
@Override
|
|
|
@Cacheable(cacheNames = CacheNames.PT_ROOM, key = "#roomId")
|
|
@Cacheable(cacheNames = CacheNames.PT_ROOM, key = "#roomId")
|
|
|
public PtRoomVo queryById(Long roomId) {
|
|
public PtRoomVo queryById(Long roomId) {
|
|
|
- PtRoomVo ptRoomVo = baseMapper.selectVoById(roomId);
|
|
|
|
|
- PtAreaVo ptAreaVo = areaService.queryById(ptRoomVo.getAreaId());
|
|
|
|
|
|
|
+ PtRoomVo ptRoomVo = TenantHelper.ignore(() -> baseMapper.selectVoById(roomId));
|
|
|
|
|
+ PtAreaVo ptAreaVo = TenantHelper.ignore(() -> areaService.queryById(ptRoomVo.getAreaId()));
|
|
|
if (ptAreaVo != null) {
|
|
if (ptAreaVo != null) {
|
|
|
ptRoomVo.setAreaName(ptAreaVo.getAreaName());
|
|
ptRoomVo.setAreaName(ptAreaVo.getAreaName());
|
|
|
}
|
|
}
|