Merge branch 'dev' into 'main'

Dev

See merge request !127

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

@@ -887,4 +887,19 @@ public class RegionController extends BaseController {
         return AjaxResult.success(gridRegionMapper.changeTreeNodeName(id,name));
     }
 
+    @RequestMapping(value = "/getFourByThreeId",method = RequestMethod.GET)
+    @ResponseBody
+    public AjaxResult getFourByThreeId(@RequestParam(value = "id", required = false) String id,
+                                       @RequestParam(value = "wgType", required = false) String wgType
+    ){
+        if(id==null || id.isEmpty()){
+            return AjaxResult.success();
+        }
+        GridRegionExample example1 = new GridRegionExample();
+        GridRegionExample.Criteria criteria1 = example1.createCriteria();
+        criteria1.andWgParentIdEqualTo("id");
+        criteria1.andWgTypeEqualTo(wgType);
+        return AjaxResult.success(gridRegionMapper.selectByExample(example1));
+    }
+
 }