as

src/main/java/com/steerinfo/dil/controller/OmstruckOrderController.java

@@ -177,23 +177,18 @@ public class OmstruckOrderController extends BaseRESTfulController {
                                                String con
 
     ) {
-        int count = 0;
         //承运商
         if (carrierId != null) {
             mapValue.put("carrierId", carrierId);
-            count++;
         }
         if (saleOrderMaterialId != null) {
             mapValue.put("saleOrderMaterialId", saleOrderMaterialId);
-            count++;
         }
         if (orderStatus != null) {
             mapValue.put("orderStatus", orderStatus);
-            count++;
         }
         if (orderType != null) {
             mapValue.put("orderTypee", orderType);
-            count++;
         }
         PageHelper.startPage(pageNum, pageSize);
         //分页数据
@@ -952,6 +947,9 @@ public class OmstruckOrderController extends BaseRESTfulController {
                                                   String con,
                                                   String carrierId) {
 
+        if (carrierId != null && !"undefined".equals(carrierId)){
+            mapValue.put("carrierIds",carrierId);
+        }
         PageHelper.startPage(pageNum,pageSize);
         List<Map<String, Object>> columnList = omstruckOrderService.getCapacityAndDriverList(mapValue);
         PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null,columnList);