diff --git a/src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/areamanage/AreaManageController.java b/src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/areamanage/AreaManageController.java
index 45bb3d6..1826710 100644
--- a/src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/areamanage/AreaManageController.java
+++ b/src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/areamanage/AreaManageController.java
@@ -4,7 +4,9 @@ import java.util.List;
 
 import javax.servlet.http.HttpSession;
 
+import com.clouds.common.utils.ResultUtils;
 import com.clouds.common.web.vo.BizResultVO;
+import com.clouds.common.web.vo.EasyUIDataGridVO;
 import com.zteits.clouds.api.apibase.bean.BaseRequest;
 import com.zteits.clouds.api.apibase.bean.BizResult;
 import com.zteits.clouds.api.apibase.constants.ErrorType;
@@ -14,6 +16,7 @@ import com.zteits.clouds.api.dto.sys.param.AreaTreeDTO;
 import com.zteits.clouds.api.service.sys.TbAreaService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.apache.poi.ss.formula.functions.T;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -47,14 +50,25 @@ public class AreaManageController {
 
     @ApiOperation("根据归属组织ID查询区域与区块树")
     @PostMapping("/queryAreaAndBlockTree")
-    public BizResultVO<List<AreaTreeDTO>> queryAreaAndBlockTree(@RequestBody BaseRequest baseRequest){
+    public BizResultVO<EasyUIDataGridVO<AreaTreeDTO>> queryAreaAndBlockTree(@RequestBody BaseRequest baseRequest){
 
+        BizResultVO<EasyUIDataGridVO<AreaTreeDTO>> resultVO = new BizResultVO<>();
+        EasyUIDataGridVO<AreaTreeDTO> easyUIDataGridVO = new EasyUIDataGridVO<>();
         AreaBlockByOrgIdQueryRequest request = new AreaBlockByOrgIdQueryRequest();
         request.setSysCode(baseRequest.getSysCode());
         // TODO 此处orgId 从当前登录操作人中取，现在先不限制
         request.setOrgId(1L);
         BizResult<List<AreaTreeDTO>> result= tbAreaService.queryAreaBlockByOrgId(request);
-        return new BizResultVO<>(result);
+        if(ResultUtils.isSuccess(result)){
+            easyUIDataGridVO.setRows(result.getData());
+            easyUIDataGridVO.setTotal(result.getData().size());
+            resultVO.setData(easyUIDataGridVO);
+        }else {
+            resultVO.setCode(result.getErrCode().getCode());
+            resultVO.setMsg(result.getErrMsg());
+        }
+
+        return resultVO;
     }
 
 }