Merge branch 'dev-lb' into 'dev'

fix

See merge request !214

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

@@ -27,6 +27,7 @@ import org.apache.poi.ss.usermodel.Workbook;
 import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -865,6 +866,7 @@ public class RegionController extends BaseController {
         return AjaxResult.success(gridRegionList);
     }
 
+    @PreAuthorize("@ss.hasPermi('system:region:remove')")
     @RequestMapping(value = "/deleteTreeNode",method = RequestMethod.DELETE)
     @ResponseBody
     public AjaxResult deleteTreeNode(@RequestParam(value = "id", required = false) String id,
@@ -894,6 +896,7 @@ public class RegionController extends BaseController {
         return AjaxResult.success();
     }
 
+    @PreAuthorize("@ss.hasPermi('system:region:edit')")
     @RequestMapping(value = "/changeName",method = RequestMethod.GET)
     @ResponseBody
     public AjaxResult changeName(@RequestParam(value = "id", required = false) String id,

ruoyi-admin/src/main/java/com/ruoyi/web/controller/house/HouseResourceController.java

@@ -6,6 +6,7 @@ import com.ruoyi.system.domain.house.HouseResource;
 import com.ruoyi.system.domain.house.vo.*;
 import com.ruoyi.system.service.house.HouseResourceService;
 import org.springframework.beans.BeanUtils;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
@@ -23,6 +24,7 @@ public class HouseResourceController {
         this.houseResourceService = houseResourceService;
     }
 
+    @PreAuthorize("@ss.hasPermi('system:house:add')")
     @PostMapping
     public AjaxResult saveHouseResource(@RequestBody HouseResourceSaveUpdateDto dto) {
         houseResourceService.saveHouseResource(dto);
@@ -34,12 +36,14 @@ public class HouseResourceController {
         return AjaxResult.success(houseResourceService.queryHouseResourceById(id));
     }
 
+    @PreAuthorize("@ss.hasPermi('system:house:edit')")
     @PutMapping
     public AjaxResult updateHouseResource(@RequestBody HouseResourceSaveUpdateDto dto) {
         houseResourceService.updateHouseResource(dto);
         return AjaxResult.success();
     }
 
+    @PreAuthorize("@ss.hasPermi('system:house:remove')")
     @DeleteMapping
     public AjaxResult deleteHouseResourceById(@RequestParam String id) {
         houseResourceService.deleteHouseResourceById(id);