Merge remote-tracking branch 'origin/master'

zengh

2021-11-05 b39cc2beacc1ec2e37cff349cae42e420105c8a6

 src/main/java/org/springblade/modules/system/controller/RegionController.java

@@ -107,7 +107,10 @@
   })
   @ApiOperationSupport(order = 4)
   @ApiOperation(value = "懒加载列表", notes = "传入menu")
   public R<List<RegionVO>> lazyTree(String parentCode, @ApiIgnore @RequestParam Map<String, Object> menu) {
   public R<List<RegionVO>> lazyTree(String parentCode, @ApiIgnore @RequestParam Map<String, Object> menu,HttpServletResponse response) {
      response.setHeader("Access-Control-Allow-Origin", "*");
      response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE");
      response.setHeader("Access-Control-Allow-Credentials", "true");
      List<RegionVO> list = regionService.lazyTree(parentCode, menu);
      return R.data(RegionWrapper.build().listNodeLazyVO(list));
   }
@@ -123,6 +126,18 @@
   }

   /**
    * 自定义新增 行政区划表
    */
   @PostMapping("/saves")
   @ApiOperationSupport(order = 5)
   @ApiOperation(value = "新增", notes = "传入region")
   public R saves(@Valid @RequestBody Region region) {
      int count = regionService.getByParentCodeCount(region.getParentCode());
      region.setCode(region.getParentCode()+count);
      return R.status(regionService.save(region));
   }

   /**
    * 修改 行政区划表
    */
   @PostMapping("/update")