From e81c17a3186458924094d9ddcfa82e8312e5e775 Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Wed, 12 Mar 2025 09:25:08 +0800
Subject: [PATCH] rebuildRoleAreaScope

---
 .../system/controller/SysRoleController.java  | 19 ++++++++++++++++++-
 .../bonus/system/service/ISysRoleService.java |  2 ++
 .../service/impl/SysRoleServiceImpl.java      | 14 ++++++++++----
 3 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/controller/SysRoleController.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/controller/SysRoleController.java
index a701635..2ff9416 100644
--- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/controller/SysRoleController.java
+++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/controller/SysRoleController.java
@@ -164,7 +164,7 @@ public class SysRoleController extends BaseController
      */
     @RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth, requiresPermissions = @RequiresPermissions("system:role:edit"))
     @PostMapping("/roleArea/edit")
-    @SysLog(title = "角色管理", businessType = OperaType.UPDATE,logType = 0,module = "系统管理->角色管理",details = "修改权限")
+    @SysLog(title = "角色管理", businessType = OperaType.UPDATE,logType = 0,module = "系统管理->角色管理->区域权限",details = "修改权限")
     public AjaxResult rebuildRoleAreaScope(@RequestBody SysRole role) {
         try{
             roleService.checkRoleAllowed(role);
@@ -176,6 +176,23 @@ public class SysRoleController extends BaseController
         }
     }
 
+    /**
+     * 修改保存数据权限
+     */
+    @RequiresPermissionsOrInnerAuth(innerAuth = @InnerAuth, requiresPermissions = @RequiresPermissions("system:role:edit"))
+    @PostMapping("/roleCanteen/edit")
+    @SysLog(title = "角色管理", businessType = OperaType.UPDATE,logType = 0,module = "系统管理->角色管理->食堂权限",details = "修改权限")
+    public AjaxResult rebuildRoleCanteenScope(@RequestBody SysRole role) {
+        try{
+            roleService.checkRoleAllowed(role);
+            roleService.checkRoleDataScope(role.getRoleId());
+            return toAjax(roleService.rebuildRoleCanteenScope(role));
+        }catch (Exception e){
+            logger.error(e.toString(),e);
+            return error(e.getMessage());
+        }
+    }
+
     /**
      * 状态修改
      */
diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/ISysRoleService.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/ISysRoleService.java
index 701e023..bb53e85 100644
--- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/ISysRoleService.java
+++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/ISysRoleService.java
@@ -131,6 +131,8 @@ public interface ISysRoleService
 
     public int rebuildRoleAreaScope(SysRole role);
 
+    public int rebuildRoleCanteenScope(SysRole role);
+
     /**
      * 通过角色ID删除角色
      * 
diff --git a/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysRoleServiceImpl.java b/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysRoleServiceImpl.java
index bc4d251..511fde4 100644
--- a/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysRoleServiceImpl.java
+++ b/bonus-modules/bonus-system/src/main/java/com/bonus/system/service/impl/SysRoleServiceImpl.java
@@ -326,13 +326,19 @@ public class SysRoleServiceImpl implements ISysRoleService
         // 删除角色与区域关联
         roleAreaMapper.deleteRoleAreaByRoleId(role.getRoleId());
         // 新增角色和区域信息（数据权限）
-        int count1 = insertRoleArea(role);
+        return insertRoleArea(role);
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public int rebuildRoleCanteenScope(SysRole role)
+    {
+        // 修改角色信息
+        roleMapper.updateRole(role);
         // 删除角色与食堂档口关联
         roleAreaMapper.deleteRoleCanteenByRoleId(role.getRoleId());
         // 新增角色和食堂档口信息（数据权限）
-        int count2 = insertRoleCanteen(role);
-
-        return count1 + count2;
+        return insertRoleCanteen(role);
     }
 
     /**