Commit 7a69babf authored by luben's avatar luben

feat

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