优化

firstleg/src/main/java/com/baiyue/firstleg/controller/PlatformFbaMasterDataController.java

@@ -76,10 +76,12 @@ public class PlatformFbaMasterDataController {
 
     @GetMapping("/carrier-rates")
     @PreAuthorize("hasAuthority('firstleg:fba-pricing:rate:view')")
+    @Operation(summary = "查询船司 FBA 价格版本", description = "默认查询全部企业；tenantId 可用于筛选目标企业")
     public ApiResponse<List<CarrierFbaRateEntity>> rates(
-        @AuthenticationPrincipal AuthenticatedUser user, @RequestParam long tenantId,
+        @AuthenticationPrincipal AuthenticatedUser user,
+        @RequestParam(required = false) Long tenantId,
         @RequestParam(required = false) String rateCode) {
-        return ApiResponse.success(service.listRates(FirstlegScopeGuard.platform(user, tenantId), rateCode));
+        return ApiResponse.success(service.listRates(optionalPlatformTenant(user, tenantId), rateCode));
     }
 
     @GetMapping("/carrier-rates/{id}")

firstleg/src/main/java/com/baiyue/firstleg/repository/FbaPricingRepository.java

@@ -21,7 +21,7 @@ import org.springframework.stereotype.Repository;
 import java.time.LocalDateTime;
 import java.util.List;
 
-/** FBA 计费仓储；平台客户规则列表可跨企业读取，其他业务操作强制带租户条件。 */
+/** FBA 计费仓储；平台基础资料列表可跨企业读取，其他业务操作强制带租户条件。 */
 @Repository
 public class FbaPricingRepository {
     private final CustomerChargeRuleMapper rules;
@@ -69,9 +69,9 @@ public class FbaPricingRepository {
             .orderByDesc(CustomerChargeRuleEntity::getRuleVersion));
     }
 
-    public List<CarrierFbaRateEntity> listRates(long tenantId, String rateCode) {
+    public List<CarrierFbaRateEntity> listRates(Long tenantId, String rateCode) {
         return rates.selectList(new LambdaQueryWrapper<CarrierFbaRateEntity>()
-            .eq(CarrierFbaRateEntity::getTenantId, tenantId)
+            .eq(tenantId != null, CarrierFbaRateEntity::getTenantId, tenantId)
             .eq(rateCode != null && !rateCode.isBlank(), CarrierFbaRateEntity::getRateCode, rateCode)
             .orderByAsc(CarrierFbaRateEntity::getRateCode)
             .orderByDesc(CarrierFbaRateEntity::getRateVersion));

firstleg/src/main/java/com/baiyue/firstleg/service/FbaMasterDataService.java

@@ -102,7 +102,7 @@ public class FbaMasterDataService {
         return repository.listRules(tenantId, code);
     }
 
-    public List<CarrierFbaRateEntity> listRates(long tenantId, String code) {
+    public List<CarrierFbaRateEntity> listRates(Long tenantId, String code) {
         return repository.listRates(tenantId, code);
     }