1.将部门修改为渠道，并且所有dice_表关联渠道表

2.将所有配置表，记录表设置关联渠道
3.优化后台页面设置

server/plugin/saiadmin/app/controller/system/SystemRoleController.php

@@ -6,10 +6,8 @@
 // +----------------------------------------------------------------------
 namespace plugin\saiadmin\app\controller\system;
 
-use plugin\saiadmin\app\model\system\SystemUserRole;
+use app\dice\helper\AdminScopeHelper;
 use plugin\saiadmin\basic\BaseController;
-use plugin\saiadmin\app\cache\UserInfoCache;
-use plugin\saiadmin\app\model\system\SystemUser;
 use plugin\saiadmin\app\validate\system\SystemRoleValidate;
 use plugin\saiadmin\app\logic\system\SystemRoleLogic;
 use plugin\saiadmin\service\Permission;
@@ -17,13 +15,10 @@ use support\Request;
 use support\Response;
 
 /**
- * 角色控制器
+ * 角色控制器（按渠道隔离）
  */
 class SystemRoleController extends BaseController
 {
-    /**
-     * 构造
-     */
     public function __construct()
     {
         $this->logic = new SystemRoleLogic();
@@ -31,11 +26,6 @@ class SystemRoleController extends BaseController
         parent::__construct();
     }
 
-    /**
-     * 数据列表
-     * @param Request $request
-     * @return Response
-     */
     #[Permission('角色数据列表', 'core:role:index')]
     public function index(Request $request): Response
     {
@@ -44,19 +34,14 @@ class SystemRoleController extends BaseController
             ['code', ''],
             ['status', ''],
         ]);
-        $query = $this->logic->search($where);
-        $levelArr = array_column($this->adminInfo['roleList'], 'level');
-        $maxLevel = max($levelArr);
-        $query->where('level', '<', $maxLevel);
-        $data = $this->logic->getList($query);
+        $requestDeptId = AdminScopeHelper::pickRequestDeptId(
+            $request->input('dept_id'),
+            $request->all()
+        );
+        $data = $this->logic->indexList($where, $requestDeptId);
         return $this->success($data);
     }
 
-    /**
-     * 读取数据
-     * @param Request $request
-     * @return Response
-     */
     #[Permission('角色数据读取', 'core:role:read')]
     public function read(Request $request): Response
     {
@@ -64,53 +49,49 @@ class SystemRoleController extends BaseController
         $model = $this->logic->read($id);
         if ($model) {
             $data = is_array($model) ? $model : $model->toArray();
+            $role = $this->logic->model->find($id);
+            if ($role) {
+                $this->logic->assertRoleWritable($role);
+            }
             return $this->success($data);
-        } else {
-            return $this->fail('not found');
         }
+        return $this->fail('not found');
     }
 
-    /**
-     * 保存数据
-     * @param Request $request
-     * @return Response
-     */
     #[Permission('角色数据添加', 'core:role:save')]
     public function save(Request $request): Response
     {
         $data = $request->post();
+        $data['dept_id'] = $this->logic->resolveRequestDeptId(
+            AdminScopeHelper::pickRequestDeptId($data['dept_id'] ?? null, $data)
+        );
         $this->validate('save', $data);
         $result = $this->logic->add($data);
         if ($result) {
             return $this->success('add success');
-        } else {
-            return $this->fail('add failed');
         }
+        return $this->fail('add failed');
     }
 
-    /**
-     * 更新数据
-     * @param Request $request
-     * @return Response
-     */
     #[Permission('角色数据修改', 'core:role:update')]
     public function update(Request $request): Response
     {
         $data = $request->post();
+        $role = $this->logic->model->find($data['id'] ?? 0);
+        if ($role) {
+            $this->logic->assertRoleWritable($role);
+            if (!isset($data['dept_id']) || $data['dept_id'] === '' || $data['dept_id'] === null) {
+                $data['dept_id'] = $role->dept_id;
+            }
+        }
         $this->validate('update', $data);
         $result = $this->logic->edit($data['id'], $data);
         if ($result) {
             return $this->success('update success');
-        } else {
-            return $this->fail('update failed');
         }
+        return $this->fail('update failed');
     }
 
-    /**
-     * 删除数据
-     * @param Request $request
-     * @return Response
-     */
     #[Permission('角色数据删除', 'core:role:destroy')]
     public function destroy(Request $request): Response
     {
@@ -121,16 +102,10 @@ class SystemRoleController extends BaseController
         $result = $this->logic->destroy($ids);
         if ($result) {
             return $this->success('delete success');
-        } else {
-            return $this->fail('delete failed');
         }
+        return $this->fail('delete failed');
     }
 
-    /**
-     * 根据角色获取菜单
-     * @param Request $request
-     * @return Response
-     */
     #[Permission('角色数据列表', 'core:role:index')]
     public function getMenuByRole(Request $request): Response
     {
@@ -139,11 +114,6 @@ class SystemRoleController extends BaseController
         return $this->success($data);
     }
 
-    /**
-     * 菜单权限
-     * @param Request $request
-     * @return Response
-     */
     #[Permission('角色菜单权限', 'core:role:menu')]
     public function menuPermission(Request $request): Response
     {
@@ -153,16 +123,14 @@ class SystemRoleController extends BaseController
         return $this->success('operation success');
     }
 
-    /**
-     * 可操作角色
-     * @param Request $request
-     * @return Response
-     */
     public function accessRole(Request $request): Response
     {
         $where = ['status' => 1];
-        $data = $this->logic->accessRole($where);
+        $requestDeptId = AdminScopeHelper::pickRequestDeptId(
+            $request->input('dept_id'),
+            $request->all()
+        );
+        $data = $this->logic->accessRole($where, $requestDeptId);
         return $this->success($data);
     }
-
 }