Merge branch 'dev' into 'main'

Dev

See merge request !62

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

@@ -762,4 +762,23 @@ public class RegionController extends BaseController {
         List<GridRegion> gridRegionList = gridRegionMapper.selectByExample(example);
         return AjaxResult.success(gridRegionList);
     }
+
+    @RequestMapping(value = "/getTwoThreeRegion",method = RequestMethod.GET)
+    @ResponseBody
+    public AjaxResult getTwoThreeRegion(@RequestParam(value = "wgType", required = false) String wgType,
+                                        @RequestParam(value = "wgCode", required = false) String wgCode,
+                                        @RequestParam(value = "pageNum", required = false) Integer pageNum,
+                                        @RequestParam(value = "pageSize", required = false) Integer pageSize
+    ){
+        GridRegionExample example = new GridRegionExample();
+        GridRegionExample.Criteria criteria = example.createCriteria();
+
+        criteria.andIsValidEqualTo("1");
+//        criteria.andLevelEqualTo(level);
+        criteria.andWgTypeEqualTo(wgType);
+        criteria.andWgCodeEqualTo(wgCode);
+
+        List<GridRegion> gridRegionList = gridRegionMapper.selectByExample(example);
+        return AjaxResult.success(gridRegionList);
+    }
 }