Merge branch 'dev' into 'main'

Dev

See merge request !111

ruoyi-admin/src/main/java/com/ruoyi/web/controller/grid/RegionController.java

@@ -594,16 +594,17 @@ public class RegionController extends BaseController {
             return AjaxResult.success(gridRegionFacadeService.getWsTreeNodeIncludeTwoPointFive(null,null,null));
         }
 
-        SysUser sysUser = getLoginUser().getUser();
+//        SysUser sysUser = getLoginUser().getUser();
         List<String> wgCodeList = new ArrayList<>();
-        if(StringUtils.isBlank(isAll) && wgType.equals("1")){
-            //目前只有基础网格有权限
-            List<GridRegionUser> list = gridRegionUserService.getPermissionWgCodes(sysUser.getUserId());
-            if(CollectionUtils.isEmpty(list)) {
-                return AjaxResult.success();
-            }
-            wgCodeList  = list.stream().map(GridRegionUser::getWgId).collect(Collectors.toList());
-        }
+//        if(StringUtils.isBlank(isAll) && wgType.equals("1")){
+//            //目前只有基础网格有权限
+////            List<GridRegionUser> list = gridRegionUserService.getPermissionWgCodes(sysUser.getUserId());
+//            List<GridRegionUser> list = gridRegionUserService.getPermissionWgCodes("1");
+//            if(CollectionUtils.isEmpty(list)) {
+//                return AjaxResult.success();
+//            }
+//            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));