|
@@ -72,7 +72,11 @@ public class AmsContractTruckPriceController extends BaseRESTfulController {
|
|
|
if(con !=null){
|
|
|
mapValue.put("con",con);
|
|
|
}
|
|
|
- PageHelper.startPage(pageNum,pageSize);
|
|
|
+ if(pageNum==null&&pageSize==null){
|
|
|
+
|
|
|
+ }else {
|
|
|
+ PageHelper.startPage(pageNum, pageSize);
|
|
|
+ }
|
|
|
List<Map<String, Object>> amsContractTransportPrice1 = amsContractTruckPriceService.getAmsContractTransportPrice(mapValue);
|
|
|
//PageListAdd pageList = columnDataUtil.tableColumnData(apiId, null,amsContractTransportPrice1);
|
|
|
List<Map<String, Object>> columnDataList = columnDataFeign.getColumnData(apiId);
|