Skip to content

Y
yichengstreet-be
Commit b5235c7b authored by luben's avatar luben
Browse files
Options

Merge branch 'dev' into 'main' 

Dev

See merge request !99
parents 80654ac1 f52edfad
Pipeline #143091 passed with stages
      in 5 minutes and 5 seconds
      Hide whitespace changes
      Inline Side-by-side
      Showing with 3 additions and 6 deletions
      ruoyi-admin/src/main/java/com/ruoyi/web/controller/grid/RegionController.java
      View file @ b5235c7b
      ...@@ -794,13 +794,12 @@ public class RegionController extends BaseController { ...@@ -794,13 +794,12 @@ public class RegionController extends BaseController {
      @RequestMapping(value = "/deleteTreeNode",method = RequestMethod.DELETE) @RequestMapping(value = "/deleteTreeNode",method = RequestMethod.DELETE)
      @ResponseBody @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 @RequestParam(value = "wgCode", required = false) String wgCode
      ){ ){
      GridRegionExample example1 = new GridRegionExample(); GridRegionExample example1 = new GridRegionExample();
      GridRegionExample.Criteria criteria1 = example1.createCriteria(); GridRegionExample.Criteria criteria1 = example1.createCriteria();
      criteria1.andIsValidEqualTo("1"); criteria1.andIsValidEqualTo("1");
      criteria1.andWgTypeEqualTo(wgType);
      criteria1.andWgParentIdEqualTo(wgCode); criteria1.andWgParentIdEqualTo(wgCode);
      long count = gridRegionMapper.countByExample(example1); long count = gridRegionMapper.countByExample(example1);
      if(count>0){ if(count>0){
      ...@@ -811,9 +810,7 @@ public class RegionController extends BaseController { ...@@ -811,9 +810,7 @@ public class RegionController extends BaseController {
      GridRegionExample.Criteria criteria = example.createCriteria(); GridRegionExample.Criteria criteria = example.createCriteria();
      criteria.andIsValidEqualTo("1"); criteria.andIsValidEqualTo("1");
      criteria.andWgTypeEqualTo(wgType); criteria.andIdEqualTo(id);
      criteria.andWgCodeEqualTo(wgCode);
      return AjaxResult.success(gridRegionMapper.deleteByExample(example)); return AjaxResult.success(gridRegionMapper.deleteByExample(example));
      } }
      ......
      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