Skip to content

Y
yichengstreet-be
Commit 01f61e8f authored by luben's avatar luben
Browse files
Options

fix

parent fe627419
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 9 deletions
ruoyi-admin/src/main/java/com/ruoyi/web/controller/grid/RegionController.java
View file @ 01f61e8f
...@@ -594,16 +594,17 @@ public class RegionController extends BaseController { ...@@ -594,16 +594,17 @@ public class RegionController extends BaseController {
return AjaxResult.success(gridRegionFacadeService.getWsTreeNodeIncludeTwoPointFive(null,null,null)); return AjaxResult.success(gridRegionFacadeService.getWsTreeNodeIncludeTwoPointFive(null,null,null));
} }
SysUser sysUser = getLoginUser().getUser(); // SysUser sysUser = getLoginUser().getUser();
List<String> wgCodeList = new ArrayList<>(); List<String> wgCodeList = new ArrayList<>();
if(StringUtils.isBlank(isAll) && wgType.equals("1")){ // if(StringUtils.isBlank(isAll) && wgType.equals("1")){
//目前只有基础网格有权限 // //目前只有基础网格有权限
List<GridRegionUser> list = gridRegionUserService.getPermissionWgCodes(sysUser.getUserId()); //// List<GridRegionUser> list = gridRegionUserService.getPermissionWgCodes(sysUser.getUserId());
if(CollectionUtils.isEmpty(list)) { // List<GridRegionUser> list = gridRegionUserService.getPermissionWgCodes("1");
return AjaxResult.success(); // if(CollectionUtils.isEmpty(list)) {
} // return AjaxResult.success();
wgCodeList = list.stream().map(GridRegionUser::getWgId).collect(Collectors.toList()); // }
} // wgCodeList = list.stream().map(GridRegionUser::getWgId).collect(Collectors.toList());
// }
// return AjaxResult.success(gridRegionFacadeService.getWsTreeNode(wgType, wgCodeList, isShow, regions)); // return AjaxResult.success(gridRegionFacadeService.getWsTreeNode(wgType, wgCodeList, isShow, regions));
return AjaxResult.success(gridRegionFacadeService.getWsTreeNode(wgType, wgCodeList, isShow)); return AjaxResult.success(gridRegionFacadeService.getWsTreeNode(wgType, wgCodeList, isShow));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment