修复Pageable和Sort参数冲突问题

- 移除同时使用Pageable和Sort参数的方法
- 在CommonDataService中使用PageRequest创建包含排序的Pageable
- 添加必要的导入

JavaBackend/src/main/java/com/lianda/backend/repository/BusCustomerCompanyRepository.java

@@ -36,11 +36,6 @@ public interface BusCustomerCompanyRepository extends JpaRepository<BusCustomerC
      */
     Page<BusCustomerCompany> findByRecordStatus(Integer recordStatus, Pageable pageable);
     
-    /**
-     * 根据记录状态和分页参数查找客户公司（支持排序）
-     */
-    Page<BusCustomerCompany> findByRecordStatus(Integer recordStatus, Pageable pageable, Sort sort);
-    
     /**
      * 根据名称和记录状态查找客户公司
      */

JavaBackend/src/main/java/com/lianda/backend/service/CommonDataService.java

@@ -14,7 +14,9 @@ import com.lianda.backend.repository.BusCustomerCustomerTypeRepository;
 import com.lianda.backend.repository.DispPortRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Sort;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
@@ -111,12 +113,13 @@ public class CommonDataService {
 
         // 查询对应的客户公司信息（支持模糊搜索和分页）
         Page<BusCustomerCompany> companyPage;
-        Sort sort = Sort.by(Sort.Direction.ASC, "name");
         if (companyName != null && !companyName.isEmpty()) {
             companyPage = busCustomerCompanyRepository.findByNameContainingAndRecordStatus(
                     companyName, 1, pageable);
         } else {
-            companyPage = busCustomerCompanyRepository.findByRecordStatus(1, pageable, sort);
+            Sort sort = Sort.by(Sort.Direction.ASC, "name");
+            Pageable sortedPageable = PageRequest.of(pageable.getPageNumber(), pageable.getPageSize(), sort);
+            companyPage = busCustomerCompanyRepository.findByRecordStatus(1, sortedPageable);
         }
 
         // 过滤出船公司类型的数据并转换为DTO