Просмотр исходного кода

feature: 消费服务
1.本地多租户消费处理

luoyb 1 год назад
Родитель
Сommit
b74b824bb7

+ 2 - 1
ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/basics/service/impl/PtMealtypeServiceImpl.java

@@ -12,6 +12,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.RequiredArgsConstructor;
+import org.dromara.common.tenant.helper.TenantHelper;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
 import org.dromara.backstage.basics.domain.bo.PtMealTypeBo;
@@ -174,7 +175,7 @@ public class PtMealtypeServiceImpl implements IPtMealtypeService {
      */
     @Override
     public PtMealTypeVo queryVoByTime(String mealTime) {
-        List<PtMealTypeVo> voList = baseMapper.queryVoByTime(mealTime);
+        List<PtMealTypeVo> voList = TenantHelper.ignore(() -> baseMapper.queryVoByTime(mealTime));
         if(voList!=null && !voList.isEmpty()){
             return voList.get(0);
         } else {

+ 1 - 1
ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/consumption/service/impl/XfTermServiceImpl.java

@@ -264,7 +264,7 @@ public class XfTermServiceImpl implements IXfTermService {
     @Override
     @Cacheable(cacheNames = CacheNames.PT_TERM, key = "#termNo")
     public XfTermVo queryByNo(Long termNo, String tenantId) {
-        XfTermVo vo = TenantHelper.ignore(() -> baseMapper.selectVoOne(new LambdaQueryWrapper<XfTerm>().eq(XfTerm::getTermNo, termNo)));
+        XfTermVo vo = TenantHelper.ignore(() -> baseMapper.selectVoOne(new LambdaQueryWrapper<XfTerm>().eq(XfTerm::getTermNo, termNo).eq(XfTerm::getTenantId,tenantId)));
         if (vo != null) {
             PtRoomVo roomVo = roomService.queryById(vo.getRoomId());
             vo.setRoomName(roomVo.getRoomName());