修改

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

@@ -84,14 +84,6 @@ public class AmsDispatchSaleOrderController extends BaseRESTfulController {
             carrierSsoId = null;
         }
         mapValue.put("carrierSsoId",carrierSsoId);
-        List<Map<String,Object>> carrierIdList = amsDispatchSaleOrderService.getCarrierIdBySSO(mapValue);
-        if (carrierIdList != null && carrierIdList.size() == 1) {
-            BigDecimal carrierId = (BigDecimal) carrierIdList.get(0).get("carrierId");
-            mapValue.put("carrierId", carrierId);
-        }
-        else {
-            mapValue.put("carrierId",null);
-        }
         PageHelper.startPage(pageNum,pageSize);
         List<Map<String, Object>> amsSaleOrder = amsDispatchSaleOrderService.getLockDispatchSaleOrderListForPc(mapValue);
         PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null,amsSaleOrder);

src/main/java/com/steerinfo/dil/service/impl/AmsDispatchSaleOrderServiceImpl.java

@@ -262,7 +262,17 @@ public class AmsDispatchSaleOrderServiceImpl extends BaseServiceImpl<AmsDispatch
     @Override
     public List<Map<String, Object>> getLockDispatchSaleOrderListForPc(Map<String,Object> mapValue) {
 //        String carrierSsoId = (String) mapValue.get("carrierSsoId");
-
+        List<Map<String,Object>> carrierIdList = amsDispatchSaleOrderMapper.getCarrierIdBySSO(mapValue);
+        if (carrierIdList != null && carrierIdList.size() == 1) {
+            BigDecimal carrierId = (BigDecimal) carrierIdList.get(0).get("carrierId");
+            mapValue.put("carrierId", carrierId);
+        }
+        else {
+            mapValue.put("carrierId",null);
+        }
+        int pageNum=Integer.parseInt(mapValue.get("pageNum")+"");
+        int pageSize=Integer.parseInt(mapValue.get("pageSize")+"");
+        PageHelper.startPage(pageNum,pageSize);
         List<Map<String, Object>> mapList = amsDispatchSaleOrderMapper.getLockDispatchSaleOrderListForPc(mapValue);
         if (mapList == null) {
             return null;
@@ -537,8 +547,4 @@ public class AmsDispatchSaleOrderServiceImpl extends BaseServiceImpl<AmsDispatch
         }
         return result;
     }
-
-    public List<Map<String, Object>> getCarrierIdBySSO(Map<String, Object> mapValue) {
-        return amsDispatchSaleOrderMapper.getCarrierIdBySSO(mapValue);
-    }
 }