Merge branch 'dev-lb' into 'dev'

feat

See merge request !232

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

@@ -1046,9 +1046,11 @@ public class RegionController extends BaseController {
     @ResponseBody
     public AjaxResult getThreeByUser(@RequestParam("wgType") String wgType,
                                      @RequestParam(value = "wgName", required = false) String wgName,
+                                     @RequestParam(value = "wgCode", required = false) String wgCode,
                                      @RequestParam("pageNum") Integer pageNum,
                                      @RequestParam("pageSize") Integer pageSize) {
         AjaxResult result = new AjaxResult();
+        if(wgCode ==null){
             SysUser user = SecurityUtils.getLoginUser().getUser();
             //网格
             GridRegionUserExample example = new GridRegionUserExample();
@@ -1071,9 +1073,18 @@ public class RegionController extends BaseController {
                 regionList.addAll(regions);
                 gridRegions = gridRegionMapper.getAllLevelThree(regionList,wgType,wgName);
             }
-
             PageInfo<GridRegion> pageInfo = new PageInfo<>(gridRegions);
             return AjaxResult.success(pageInfo);
+        }else{
+            List<String> regions = new ArrayList<>();
+            regions.add(wgCode);
+            List<String> regionList = new ArrayList<>();
+            regionList.addAll(regions);
+            List<GridRegion> gridRegions = new ArrayList<>();
+            gridRegions = gridRegionMapper.getAllLevelThree(regions,wgType,wgName);
+            PageInfo<GridRegion> pageInfo = new PageInfo<>(gridRegions);
+            return AjaxResult.success(pageInfo);
+        }
     }
 
     @RequestMapping(value = "/getAllTwoRegion",method = RequestMethod.GET)