Merge branch 'dev' into 'main'

Dev

See merge request !99

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

@@ -794,13 +794,12 @@ public class RegionController extends BaseController {
 
     @RequestMapping(value = "/deleteTreeNode",method = RequestMethod.DELETE)
     @ResponseBody
-    public AjaxResult getTwoThreeRegion(@RequestParam(value = "wgType", required = false) String wgType,
+    public AjaxResult deleteTreeNode(@RequestParam(value = "id", required = false) String id,
                                      @RequestParam(value = "wgCode", required = false) String wgCode
     ){
         GridRegionExample example1 = new GridRegionExample();
         GridRegionExample.Criteria criteria1 = example1.createCriteria();
         criteria1.andIsValidEqualTo("1");
-        criteria1.andWgTypeEqualTo(wgType);
         criteria1.andWgParentIdEqualTo(wgCode);
         long count = gridRegionMapper.countByExample(example1);
         if(count>0){
@@ -811,9 +810,7 @@ public class RegionController extends BaseController {
         GridRegionExample.Criteria criteria = example.createCriteria();
 
         criteria.andIsValidEqualTo("1");
-        criteria.andWgTypeEqualTo(wgType);
-        criteria.andWgCodeEqualTo(wgCode);
-
+        criteria.andIdEqualTo(id);
 
         return AjaxResult.success(gridRegionMapper.deleteByExample(example));
     }