diff --git a/private-farm/src/main/java/com/jlt/csa/controller/FarmZoneController.java b/private-farm/src/main/java/com/jlt/csa/controller/FarmZoneController.java index 2f4dcb644..f25d97993 100644 --- a/private-farm/src/main/java/com/jlt/csa/controller/FarmZoneController.java +++ b/private-farm/src/main/java/com/jlt/csa/controller/FarmZoneController.java @@ -37,7 +37,7 @@ public class FarmZoneController extends BaseController /** * 查询农场分区列表 */ - @PreAuthorize("@ss.hasPermi('csa:farmzone:list')") + @PreAuthorize("@ss.hasPermi('csa:farmzone:query')") @GetMapping("/list") public TableDataInfo list(FarmZone farmZone) { @@ -72,7 +72,7 @@ public class FarmZoneController extends BaseController /** * 新增农场分区 */ - @PreAuthorize("@ss.hasPermi('csa:farmzone:add')") + @PreAuthorize("@ss.hasPermi('csa:farmzone:update')") @Log(title = "农场分区", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody FarmZone farmZone) @@ -83,7 +83,7 @@ public class FarmZoneController extends BaseController /** * 修改农场分区 */ - @PreAuthorize("@ss.hasPermi('csa:farmzone:edit')") + @PreAuthorize("@ss.hasPermi('csa:farmzone:update')") @Log(title = "农场分区", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody FarmZone farmZone) @@ -94,7 +94,7 @@ public class FarmZoneController extends BaseController /** * 删除农场分区 */ - @PreAuthorize("@ss.hasPermi('csa:farmzone:remove')") + @PreAuthorize("@ss.hasPermi('csa:farmzone:update')") @Log(title = "农场分区", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public AjaxResult remove(@PathVariable Long[] ids) diff --git a/private-farm/src/main/java/com/jlt/csa/controller/GardenController.java b/private-farm/src/main/java/com/jlt/csa/controller/GardenController.java index aef0d2030..6de28edbc 100644 --- a/private-farm/src/main/java/com/jlt/csa/controller/GardenController.java +++ b/private-farm/src/main/java/com/jlt/csa/controller/GardenController.java @@ -37,7 +37,7 @@ public class GardenController extends BaseController /** * 查询菜地划分列表 */ - @PreAuthorize("@ss.hasPermi('csa:garden:list')") + @PreAuthorize("@ss.hasPermi('csa:garden:query')") @GetMapping("/list") public TableDataInfo list(Garden garden) { @@ -72,7 +72,7 @@ public class GardenController extends BaseController /** * 新增菜地划分 */ - @PreAuthorize("@ss.hasPermi('csa:garden:add')") + @PreAuthorize("@ss.hasPermi('csa:garden:update')") @Log(title = "菜地划分", businessType = BusinessType.INSERT) @PostMapping public AjaxResult add(@RequestBody Garden garden) @@ -83,7 +83,7 @@ public class GardenController extends BaseController /** * 修改菜地划分 */ - @PreAuthorize("@ss.hasPermi('csa:garden:edit')") + @PreAuthorize("@ss.hasPermi('csa:garden:update')") @Log(title = "菜地划分", businessType = BusinessType.UPDATE) @PutMapping public AjaxResult edit(@RequestBody Garden garden) @@ -94,8 +94,8 @@ public class GardenController extends BaseController /** * 批量更新菜地状态 */ - @PreAuthorize("@ss.hasPermi('csa:garden:edit')") - @Log(title = "农场分区", businessType = BusinessType.UPDATE) + @PreAuthorize("@ss.hasPermi('csa:garden:update')") + @Log(title = "菜地划分", businessType = BusinessType.UPDATE) @PutMapping("/{ids}") public AjaxResult updateStatus(@RequestBody Garden garden, @PathVariable Long[] ids) { @@ -105,7 +105,7 @@ public class GardenController extends BaseController /** * 删除菜地划分 */ - @PreAuthorize("@ss.hasPermi('csa:garden:remove')") + @PreAuthorize("@ss.hasPermi('csa:garden:update')") @Log(title = "菜地划分", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public AjaxResult remove(@PathVariable Long[] ids) diff --git a/ruoyi-ui/src/views/csa/farmzone/index.vue b/ruoyi-ui/src/views/csa/farmzone/index.vue index dba747136..10cab3e17 100644 --- a/ruoyi-ui/src/views/csa/farmzone/index.vue +++ b/ruoyi-ui/src/views/csa/farmzone/index.vue @@ -43,7 +43,7 @@ icon="el-icon-plus" size="mini" @click="handleAdd" - v-hasPermi="['csa:farmzone:add']" + v-hasPermi="['csa:farmzone:update']" >新增 @@ -54,7 +54,7 @@ size="mini" :disabled="single" @click="handleUpdate" - v-hasPermi="['csa:farmzone:edit']" + v-hasPermi="['csa:farmzone:update']" >修改 @@ -65,7 +65,7 @@ size="mini" :disabled="multiple" @click="handleDelete" - v-hasPermi="['csa:farmzone:remove']" + v-hasPermi="['csa:farmzone:update']" >删除 @@ -102,14 +102,14 @@ type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" - v-hasPermi="['csa:farmzone:edit']" + v-hasPermi="['csa:farmzone:update']" >修改 删除 diff --git a/ruoyi-ui/src/views/csa/garden/index.vue b/ruoyi-ui/src/views/csa/garden/index.vue index cb0ffce17..a8da9038e 100644 --- a/ruoyi-ui/src/views/csa/garden/index.vue +++ b/ruoyi-ui/src/views/csa/garden/index.vue @@ -43,7 +43,7 @@ icon="el-icon-plus" size="mini" @click="handleAdd" - v-hasPermi="['csa:garden:add']" + v-hasPermi="['csa:garden:update']" >新增 @@ -54,7 +54,7 @@ size="mini" :disabled="single" @click="handleUpdate" - v-hasPermi="['csa:garden:edit']" + v-hasPermi="['csa:garden:update']" >修改 @@ -65,7 +65,7 @@ size="mini" :disabled="multiple" @click="handleDelete" - v-hasPermi="['csa:garden:remove']" + v-hasPermi="['csa:garden:update']" >删除 @@ -85,7 +85,7 @@ icon="el-icon-finished" size="mini" @click="handleComplete" - v-hasPermi="['csa:garden:edit']" + v-hasPermi="['csa:garden:update']" >竣工 @@ -134,7 +134,7 @@ icon="el-icon-edit" :disabled="scope.row.isCompleted == 'Y'" @click="handleUpdate(scope.row)" - v-hasPermi="['csa:garden:edit']" + v-hasPermi="['csa:garden:update']" >修改 删除