接口修复

fs-admin-saas/src/main/java/com/fs/course/controller/FsCoursePlaySourceConfigController.java

@@ -12,6 +12,7 @@ import com.fs.common.annotation.Log;
 import com.fs.common.core.controller.BaseController;
 import com.fs.common.core.domain.AjaxResult;
 import com.fs.common.core.domain.R;
+import com.fs.common.core.domain.model.LoginUser;
 import com.fs.common.core.page.TableDataInfo;
 import com.fs.common.enums.BusinessType;
 import com.fs.common.utils.ServletUtils;
@@ -176,18 +177,17 @@ public class FsCoursePlaySourceConfigController extends BaseController {
 
     @GetMapping("/listAll")
     public R listAll(Long companyId) {
-//        com.fs.framework.security.LoginUser loginUser = (com.fs.framework.security.LoginUser) tokenService.getLoginUser(ServletUtils.getRequest());
-//        String json = configService.selectConfigByKey("course.config");
-//        CourseConfig config = JSONUtil.toBean(json, CourseConfig.class);
-//        QueryWrapper<FsCoursePlaySourceConfig> queryWrapper = new QueryWrapper<FsCoursePlaySourceConfig>().eq("is_del", 0);
-//        if(!loginUser.isAdmin() && config.getDept() != null && config.getDept()){
-//            queryWrapper.eq("create_user_id", loginUser.getUserId()).eq(config.getDept() == null || !config.getDept(), "create_dept_id", loginUser.getDeptId());
-//        }
-//        if(companyId != null){
-//            queryWrapper.and(e -> e.eq("company_id", companyId).or().isNull("company_id"));
-//        }
-//        return R.ok().put("data", fsCoursePlaySourceConfigService.list(queryWrapper));
-        throw new RuntimeException("未实现");
+        LoginUser loginUser =  tokenService.getLoginUser(ServletUtils.getRequest());
+        String json = configService.selectConfigByKey("course.config");
+        CourseConfig config = JSONUtil.toBean(json, CourseConfig.class);
+        QueryWrapper<FsCoursePlaySourceConfig> queryWrapper = new QueryWrapper<FsCoursePlaySourceConfig>().eq("is_del", 0);
+        if(!loginUser.isAdmin() && config.getDept() != null && config.getDept()){
+            queryWrapper.eq("create_user_id", loginUser.getUserId()).eq(config.getDept() == null || !config.getDept(), "create_dept_id", loginUser.getDeptId());
+        }
+        if(companyId != null){
+            queryWrapper.and(e -> e.eq("company_id", companyId).or().isNull("company_id"));
+        }
+        return R.ok().put("data", fsCoursePlaySourceConfigService.list(queryWrapper));
     }
 
 

fs-admin/src/main/java/com/fs/admin/interceptor/AdminTenantDataSourceInterceptor.java

@@ -46,6 +46,10 @@ public class AdminTenantDataSourceInterceptor extends HandlerInterceptorAdapter
     @Autowired
     private TenantInfoService tenantInfoService;
 
+    //① Query 参数   ?tenantId=33          ✅ 已支持
+    //② 请求头       tenant-id: 33         ✅ 已支持 推荐用这种
+    //③ URL 路径     /admin/product/33     ✅ 已支持
+    //④ JSON Body    {"tenantId":"33"}     ❌ 拿不到
     @Override
     public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) {
         if (!(handler instanceof HandlerMethod)) {
@@ -57,7 +61,6 @@ public class AdminTenantDataSourceInterceptor extends HandlerInterceptorAdapter
                 && !method.isAnnotationPresent(TenantDS.class)) {
             return true;
         }
-
         String tenantIdStr = request.getParameter("tenantId");
         if (!StringUtils.hasText(tenantIdStr)) {
             tenantIdStr = request.getHeader(HEADER_TENANT_ID);