fangcheng / regional-platform

Download as
Browse Code ยป

Commit 74cf1865a9b48408cf0bbb1d82ba7ef7392a082b

Authored by liquanyu
2 parents 1270c71ac9 d862b282f0
Exists in master and in 1 other branch nobuildprocess

Merge remote-tracking branch 'origin/master'

Showing 1 changed file

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RegionController.java View file @ 74cf186
... ... @@ -112,13 +112,17 @@
112 112  
113 113 @RequestMapping(value = "/queryRegions",method = RequestMethod.GET)
114 114 public void queryRegions(@RequestParam(value = "parentId", required = false) String parentId,
  115 + @RequestParam(value = "id", required = false) String id,
115 116 HttpServletResponse httpServletResponse, HttpServletRequest request ){
116 117 BasicConfigQuery query = new BasicConfigQuery();
117   - if(StringUtils.isBlank(parentId)) {
  118 + if(StringUtils.isBlank(parentId) && StringUtils.isBlank(id)) {
118 119 query.setParentId(SystemConfig.CHINA_BASIC_ID);
119   - } else {
  120 + } else if(StringUtils.isNotBlank(parentId)){
120 121 query.setParentId(parentId);
  122 + }else if(StringUtils.isNotBlank(id)) {
  123 + query.setId(id);
121 124 }
  125 +
122 126 query.setYn(YnEnums.YES.getId());
123 127  
124 128 List<BasicConfig> configList = basicConfigService.queryBasicConfig(query);