BJ_ZTEITS-Developers / zteits-bcp-portal

Commit 053aa9f197db66553ff42dfe1d97aef6538179fd

Authored by atao
1 parent da00abba

提交代码

Inline Side-by-side
Showing 1 changed file with 4 additions and 5 deletions
src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/areamanage/AreaManageController.java
  View file @053aa9f
@@ -11,7 +11,6 @@ import com.zteits.clouds.api.apibase.bean.BaseRequest; @@ -11,7 +11,6 @@ import com.zteits.clouds.api.apibase.bean.BaseRequest;
11 import com.zteits.clouds.api.apibase.bean.BizResult; 11 import com.zteits.clouds.api.apibase.bean.BizResult;
12 import com.zteits.clouds.api.dto.sys.AreaTreeDTO; 12 import com.zteits.clouds.api.dto.sys.AreaTreeDTO;
13 import com.zteits.clouds.api.dto.sys.param.AreaBlockByOrgIdQueryRequest; 13 import com.zteits.clouds.api.dto.sys.param.AreaBlockByOrgIdQueryRequest;
14 -  
15 import com.zteits.clouds.api.service.sys.TbAreaService; 14 import com.zteits.clouds.api.service.sys.TbAreaService;
16 import io.swagger.annotations.Api; 15 import io.swagger.annotations.Api;
17 import io.swagger.annotations.ApiOperation; 16 import io.swagger.annotations.ApiOperation;
@@ -48,7 +47,7 @@ public class AreaManageController { @@ -48,7 +47,7 @@ public class AreaManageController {
48 47
49 @ApiOperation("根据归属组织ID查询区域与区块树") 48 @ApiOperation("根据归属组织ID查询区域与区块树")
50 @PostMapping("/queryAreaAndBlockTree") 49 @PostMapping("/queryAreaAndBlockTree")
51 - public BizResultVO<EasyUIDataGridVO<AreaTreeDTO>> queryAreaAndBlockTree(@RequestBody BaseRequest baseRequest){ 50 + public BizResultVO<EasyUIDataGridVO<AreaTreeDTO>> queryAreaAndBlockTree(@RequestBody BaseRequest baseRequest) {
52 51
53 BizResultVO<EasyUIDataGridVO<AreaTreeDTO>> resultVO = new BizResultVO<>(); 52 BizResultVO<EasyUIDataGridVO<AreaTreeDTO>> resultVO = new BizResultVO<>();
54 EasyUIDataGridVO<AreaTreeDTO> easyUIDataGridVO = new EasyUIDataGridVO<>(); 53 EasyUIDataGridVO<AreaTreeDTO> easyUIDataGridVO = new EasyUIDataGridVO<>();
@@ -56,12 +55,12 @@ public class AreaManageController { @@ -56,12 +55,12 @@ public class AreaManageController {
56 request.setSysCode(baseRequest.getSysCode()); 55 request.setSysCode(baseRequest.getSysCode());
57 // TODO 此处orgId 从当前登录操作人中取，现在先不限制 56 // TODO 此处orgId 从当前登录操作人中取，现在先不限制
58 request.setOrgId(1L); 57 request.setOrgId(1L);
59 - BizResult<List<AreaTreeDTO>> result= tbAreaService.queryAreaBlockByOrgId(request);  
60 - if(ResultUtils.isSuccess(result)){ 58 + BizResult<List<AreaTreeDTO>> result = tbAreaService.queryAreaBlockByOrgId(request);
  59 + if (ResultUtils.isSuccess(result)) {
61 easyUIDataGridVO.setRows(result.getData()); 60 easyUIDataGridVO.setRows(result.getData());
62 easyUIDataGridVO.setTotal(result.getData().size()); 61 easyUIDataGridVO.setTotal(result.getData().size());
63 resultVO.setData(easyUIDataGridVO); 62 resultVO.setData(easyUIDataGridVO);
64 - }else { 63 + } else {
65 resultVO.setCode(result.getErrCode().getCode()); 64 resultVO.setCode(result.getErrCode().getCode());
66 resultVO.setMsg(result.getErrMsg()); 65 resultVO.setMsg(result.getErrMsg());
67 } 66 }