BJ_ZTEITS-Developers / zteits-bcp-portal

Commit 2312c4ee035c7c7e98bf05e78ff21b32e8e96855

Authored by atao
1 parent 6f1a5492

提交代码

Inline Side-by-side
Showing 1 changed file with 6 additions and 2 deletions
src/main/java/com/zteits/irain/portal/web/parkinglotcloudplatform/areamanage/AreaManageController.java
  View file @2312c4e
... ... @@ -5,6 +5,7 @@ import java.util.List;
5 5 import javax.servlet.http.HttpSession;
6 6  
7 7 import com.clouds.common.utils.ResultUtils;
  8 +import com.clouds.common.web.SessionCommUtil;
8 9 import com.clouds.common.web.vo.BizResultVO;
9 10 import com.clouds.common.web.vo.EasyUIDataGridVO;
10 11 import com.zteits.clouds.api.apibase.bean.BaseRequest;
... ... @@ -18,6 +19,7 @@ import com.zteits.clouds.api.service.park.ParkingLotService;
18 19 import com.zteits.clouds.api.service.sys.TbAreaService;
19 20 import io.swagger.annotations.Api;
20 21 import io.swagger.annotations.ApiOperation;
  22 +import jdk.nashorn.internal.objects.annotations.Property;
21 23 import org.slf4j.Logger;
22 24 import org.slf4j.LoggerFactory;
23 25 import org.springframework.beans.factory.annotation.Autowired;
... ... @@ -52,6 +54,9 @@ public class AreaManageController {
52 54 @Autowired
53 55 private ParkingLotService parkingLotService;
54 56  
  57 + @Autowired
  58 + private SessionCommUtil sessionCommUtil;
  59 +
55 60 @ApiOperation("根据归属组织ID查询区域与区块树")
56 61 @PostMapping("/queryAreaAndBlockTree")
57 62 public BizResultVO<EasyUIDataGridVO<AreaTreeDTO>> queryAreaAndBlockTree(@RequestBody BaseRequest baseRequest) {
... ... @@ -60,8 +65,7 @@ public class AreaManageController {
60 65 EasyUIDataGridVO<AreaTreeDTO> easyUIDataGridVO = new EasyUIDataGridVO<>();
61 66 AreaBlockByOrgIdQueryRequest request = new AreaBlockByOrgIdQueryRequest();
62 67 request.setSysCode(baseRequest.getSysCode());
63   - // TODO 此处orgId 从当前登录操作人中取，现在先不限制
64   - request.setOrgId(1L);
  68 + request.setOrgId(sessionCommUtil.getUserInfo().getOrgId());
65 69 BizResult<List<AreaTreeDTO>> result = tbAreaService.queryAreaBlockByOrgId(request);
66 70 if (ResultUtils.isSuccess(result)) {
67 71 easyUIDataGridVO.setRows(result.getData());
... ...