Merge branch 'dev-lb' into 'dev'

feat

See merge request !232

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

@@ -1046,34 +1046,45 @@ 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();
-        SysUser user = SecurityUtils.getLoginUser().getUser();
-        //网格
-        GridRegionUserExample example = new GridRegionUserExample();
-        GridRegionUserExample.Criteria criteria = example.createCriteria();
-        criteria.andUserIdEqualTo(user.getUserId());
-        criteria.andIsValidEqualTo("1");
+        if(wgCode ==null){
+            SysUser user = SecurityUtils.getLoginUser().getUser();
+            //网格
+            GridRegionUserExample example = new GridRegionUserExample();
+            GridRegionUserExample.Criteria criteria = example.createCriteria();
+            criteria.andUserIdEqualTo(user.getUserId());
+            criteria.andIsValidEqualTo("1");
 
-        List<GridRegionUser> relationship = gridRegionUserService.selectByExample(example);
-        String region = relationship.stream().map(GridRegionUser::getWgId).collect(Collectors.joining(","));
-        List<String> regions = Arrays.asList(region.split(","));
-        List<String> regionList = new ArrayList<>();
+            List<GridRegionUser> relationship = gridRegionUserService.selectByExample(example);
+            String region = relationship.stream().map(GridRegionUser::getWgId).collect(Collectors.joining(","));
+            List<String> regions = Arrays.asList(region.split(","));
+            List<String> regionList = new ArrayList<>();
 
-        List<GridRegion> gridRegions = new ArrayList<>();
-        PageHelper.startPage(pageNum, pageSize);
-        //3.20权限bug
-        if(regions.get(0).equals("320282001")){
+            List<GridRegion> gridRegions = new ArrayList<>();
+            PageHelper.startPage(pageNum, pageSize);
+            //3.20权限bug
+            if(regions.get(0).equals("320282001")){
 //            regionList.add("320282001");
-            gridRegions = gridRegionMapper.getAllLevelThree(null,wgType,wgName);
+                gridRegions = gridRegionMapper.getAllLevelThree(null,wgType,wgName);
+            }else{
+                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);
-            gridRegions = gridRegionMapper.getAllLevelThree(regionList,wgType,wgName);
+            List<GridRegion> gridRegions = new ArrayList<>();
+            gridRegions = gridRegionMapper.getAllLevelThree(regions,wgType,wgName);
+            PageInfo<GridRegion> pageInfo = new PageInfo<>(gridRegions);
+            return AjaxResult.success(pageInfo);
         }
-
-        PageInfo<GridRegion> pageInfo = new PageInfo<>(gridRegions);
-        return AjaxResult.success(pageInfo);
     }
 
     @RequestMapping(value = "/getAllTwoRegion",method = RequestMethod.GET)