diff --git a/src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/parklotmanage/ParkLotManageController.java b/src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/parklotmanage/ParkLotManageController.java
index 864caec..f359273 100644
--- a/src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/parklotmanage/ParkLotManageController.java
+++ b/src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/parklotmanage/ParkLotManageController.java
@@ -144,6 +144,11 @@ public class ParkLotManageController extends BizController{
 		if (request == null) {
 	         throw new BizException(ErrorType.PARAMM_NULL, "请求对象");
 	    }
+		if(CollectionUtils.isEmpty(request.getPlAreaBlockIds())){
+			PageBean<ParkingLotDTO> pageBean = new PageBean<ParkingLotDTO>();
+			BizResult<PageBean<ParkingLotDTO>> result = new BizResult<PageBean<ParkingLotDTO>>(pageBean);
+			return returnJqGridData(result, ParkingLotDTO.class);
+		}
 		BizResult<PageBean<ParkingLotDTO>> bizResult = parkingLotQueryService.queryParkingLotByPark(request,request.getBaseRequest().getPageNum(), request.getBaseRequest().getPageSize());
 		return returnJqGridData(bizResult, ParkingLotDTO.class);
 	}
@@ -212,9 +217,13 @@ public class ParkLotManageController extends BizController{
 	    queryParking.setPlNos(plNos);
 	    queryParking.setPlAreaBlockIds(plAreaBlockIds);
 	    queryParking.setPlType(plType);
-	    BizResult<PageBean<ParkingLotDTO>> bizResult = parkingLotQueryService.queryParkingLotByPark(queryParking,0,0);
-			
-		String[] title = new String[]{"停车场编号","停车场名称","块名称","区间数","泊位数"};	
+	    PageBean<ParkingLotDTO> pageBean = new PageBean<ParkingLotDTO>();
+	    BizResult<PageBean<ParkingLotDTO>> bizResult = new BizResult<PageBean<ParkingLotDTO>>(pageBean);
+	    if(!CollectionUtils.isEmpty(plAreaBlockIds)){
+			bizResult = parkingLotQueryService.queryParkingLotByPark(queryParking,0,0);
+		}
+		String[] title = new String[]{"停车场编号","停车场名称","省","市","区","块名称"
+				,"出口数","入口数","泊位数","停车场地址","区间数","泊位数","经度","纬度"};	
 		String sheetName="停车场";
 		String fileName = "停车场信息"; 
 		// 1.创建excel信息
@@ -230,9 +239,18 @@ public class ParkLotManageController extends BizController{
 				 int index=0;
 				 obj[index++]=e.getPlNo();
 				 obj[index++]=e.getPlName();
+				 obj[index++]=e.getPlProvinceName();
+				 obj[index++]=e.getPlCityName();
+				 obj[index++]=e.getPlCountryName();
 				 obj[index++]=e.getPlAreaBlockName();
+				 obj[index++]=e.getPlExitNum();
+				 obj[index++]=e.getPlEntranceNum();
+				 obj[index++]=e.getPlBerthNum();
+				 obj[index++]=e.getPlAddress();
 				 obj[index++]=e.getParkAreaNum();
 				 obj[index++]=e.getBerthNum();
+				 obj[index++]=e.getLonId();
+				 obj[index++]=e.getLatId();
 				 contentList.add(obj);
 			}
 		}