修改

1、获得膳食满意度调查分页接口根据前端传入的机构id进行过滤

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/evaluation/FoodSatisfactionSurveyController.java

@@ -6,6 +6,7 @@ import cn.iocoder.yudao.framework.common.pojo.PageParam;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 import cn.iocoder.yudao.framework.excel.core.util.ExcelUtils;
+import cn.iocoder.yudao.framework.tenant.core.aop.TenantIgnore;
 import cn.iocoder.yudao.framework.tenant.core.context.TenantContextHolder;
 import cn.iocoder.yudao.module.system.controller.admin.evaluation.vo.FoodSatisfactionSurveyPageReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.evaluation.vo.FoodSatisfactionSurveyRespVO;
@@ -88,9 +89,8 @@ public class FoodSatisfactionSurveyController {
 
     @GetMapping("/page")
     @Operation(summary = "获得膳食满意度调查分页")
+    @TenantIgnore
     public CommonResult<PageResult<FoodSatisfactionSurveyRespVO>> getPage(@Valid FoodSatisfactionSurveyPageReqVO pageReqVO) {
-        pageReqVO.setTenantId(Objects.isNull(pageReqVO.getTenantId())
-                ? TenantContextHolder.getTenantId() : pageReqVO.getTenantId());
         return success(foodSatisfactionSurveyService.getPage(pageReqVO));
     }
 

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/evaluation/FoodSatisfactionSurveyMapper.java

@@ -15,9 +15,9 @@ public interface FoodSatisfactionSurveyMapper extends BaseMapperX<FoodSatisfacti
 
     default PageResult<FoodSatisfactionSurveyDO> selectPage(FoodSatisfactionSurveyPageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<FoodSatisfactionSurveyDO>()
-                .eqIfPresent(FoodSatisfactionSurveyDO::getTenantId, reqVO.getTenantId())
                 .eqIfPresent(FoodSatisfactionSurveyDO::getRole, reqVO.getRole())
                 .betweenIfPresent(FoodSatisfactionSurveyDO::getRecordDate, reqVO.getRecordDate())
+                .in(FoodSatisfactionSurveyDO::getTenantId, reqVO.getTenantIds())
                 .orderByDesc(FoodSatisfactionSurveyDO::getRecordDate)
                 .orderByDesc(FoodSatisfactionSurveyDO::getId));
     }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/evaluation/FoodSatisfactionSurveyServiceImpl.java

@@ -63,9 +63,6 @@ public class FoodSatisfactionSurveyServiceImpl implements FoodSatisfactionSurvey
 
     @Override
     public PageResult<FoodSatisfactionSurveyRespVO> getPage(FoodSatisfactionSurveyPageReqVO pageReqVO) {
-        if (pageReqVO.getTenantId() == null) {
-            pageReqVO.setTenantId(TenantContextHolder.getTenantId());
-        }
         PageResult<FoodSatisfactionSurveyDO> pageResult = foodSatisfactionSurveyMapper.selectPage(pageReqVO);
         return BeanUtils.toBean(pageResult, FoodSatisfactionSurveyRespVO.class);
     }