Remove data scope in the role model (#478)

Author: wu-clan

backend/app/admin/api/v1/sys/role.py

@@ -69,10 +69,9 @@ async def get_role(pk: Annotated[int, Path(...)]) -> ResponseModel:
 async def get_pagination_roles(
     db: CurrentSession,
     name: Annotated[str | None, Query()] = None,
-    data_scope: Annotated[int | None, Query()] = None,
     status: Annotated[int | None, Query()] = None,
 ) -> ResponseModel:
-    role_select = await role_service.get_select(name=name, data_scope=data_scope, status=status)
+    role_select = await role_service.get_select(name=name, status=status)
     page_data = await paging_data(db, role_select, GetRoleListDetails)
     return response_base.success(data=page_data)
 

backend/app/admin/crud/crud_role.py

@@ -63,12 +63,11 @@ async def get_by_user(self, db, user_id: int) -> Sequence[Role]:
         roles = await db.execute(stmt)
         return roles.scalars().all()
 
-    async def get_list(self, name: str = None, data_scope: int = None, status: int = None) -> Select:
+    async def get_list(self, name: str = None, status: int = None) -> Select:
         """
         获取角色列表
 
         :param name:
-        :param data_scope:
         :param status:
         :return:
         """
@@ -80,8 +79,6 @@ async def get_list(self, name: str = None, data_scope: int = None, status: int =
         where_list = []
         if name:
             where_list.append(self.model.name.like(f'%{name}%'))
-        if data_scope:
-            where_list.append(self.model.data_scope == data_scope)
         if status is not None:
             where_list.append(self.model.status == status)
         if where_list:

backend/app/admin/model/role.py

@@ -15,10 +15,6 @@ class Role(Base):
 
     id: Mapped[id_key] = mapped_column(init=False)
     name: Mapped[str] = mapped_column(String(20), unique=True, comment='角色名称')
-    data_scope: Mapped[int | None] = mapped_column(
-        default=0,
-        comment='数据权限范围（0: 全部数据，1: 自定义数据，2: 所在部门及以下数据，3: 所在部门数据，4: 仅本人数据）',
-    )
     status: Mapped[int] = mapped_column(default=1, comment='角色状态（0停用 1正常）')
     remark: Mapped[str | None] = mapped_column(LONGTEXT, default=None, comment='备注')
 

backend/app/admin/service/role_service.py

@@ -43,8 +43,8 @@ async def get_by_user(*, pk: int) -> Sequence[Role]:
             return roles
 
     @staticmethod
-    async def get_select(*, name: str = None, data_scope: int = None, status: int = None) -> Select:
-        return await role_dao.get_list(name=name, data_scope=data_scope, status=status)
+    async def get_select(*, name: str = None, status: int = None) -> Select:
+        return await role_dao.get_list(name=name, status=status)
 
     @staticmethod
     async def create(*, obj: CreateRoleParam) -> None:

backend/sql/create_tables.sql

@@ -307,7 +307,6 @@ CREATE TABLE `sys_role`
 (
     `id`           int         NOT NULL AUTO_INCREMENT COMMENT '主键id',
     `name`         varchar(20) NOT NULL COMMENT '角色名称',
-    `data_scope`   int      DEFAULT NULL COMMENT '数据权限范围（0: 全部数据，1: 自定义数据，2: 所在部门及以下数据，3: 所在部门数据，4: 仅本人数据）',
     `status`       int         NOT NULL COMMENT '角色状态（0停用 1正常）',
     `remark`       longtext COMMENT '备注',
     `created_time` datetime    NOT NULL COMMENT '创建时间',

backend/sql/init_pytest_data.sql

@@ -28,7 +28,7 @@ VALUES (1, '测试', 'test', 0, 0, '', NULL, 0, NULL, NULL, 0, 0, 1, NULL, NULL,
        (19, '官网', 'site', 0, 998, 'IconComputer', 'https://fastapi-practices.github.io/fastapi_best_architecture_docs/', 1, NULL, NULL, 1, 1, 1, NULL, NULL, '2023-07-27 19:22:24', NULL),
        (20, '赞助', 'sponsor', 0, 999, 'IconFire', 'https://wu-clan.github.io/sponsor/', 1, NULL, NULL, 1, 1, 1, NULL, NULL, '2024-07-27 12:39:57', NULL);
 
-INSERT INTO `fba_test`.`sys_role` (`id`, `name`, `data_scope`, `status`, `remark`, `created_time`, `updated_time`) VALUES (1, 'test', 2, 1, NULL, '2023-06-26 17:13:45', NULL);
+INSERT INTO `fba_test`.`sys_role` (`id`, `name`, `status`, `remark`, `created_time`, `updated_time`) VALUES (1, 'test', 1, NULL, '2023-06-26 17:13:45', NULL);
 
 INSERT INTO `fba_test`.`sys_role_menu` (`id`, `role_id`, `menu_id`) VALUES (1, 1, 1);
 

backend/sql/init_test_data.sql

@@ -28,7 +28,7 @@ VALUES (1, '测试', 'test', 0, 0, '', NULL, 0, NULL, NULL, 0, 0, 1, NULL, NULL,
        (19, '官网', 'site', 0, 998, 'IconComputer', 'https://fastapi-practices.github.io/fastapi_best_architecture_docs/', 1, NULL, NULL, 1, 1, 1, NULL, NULL, '2023-07-27 19:22:24', NULL),
        (20, '赞助', 'sponsor', 0, 999, 'IconFire', 'https://wu-clan.github.io/sponsor/', 1, NULL, NULL, 1, 1, 1, NULL, NULL, '2024-07-27 12:39:57', NULL);
 
-INSERT INTO `fba`.`sys_role` (`id`, `name`, `data_scope`, `status`, `remark`, `created_time`, `updated_time`) VALUES (1, 'test', 2, 1, NULL, '2023-06-26 17:13:45', NULL);
+INSERT INTO `fba`.`sys_role` (`id`, `name`, `status`, `remark`, `created_time`, `updated_time`) VALUES (1, 'test', 1, NULL, '2023-06-26 17:13:45', NULL);
 
 INSERT INTO `fba`.`sys_role_menu` (`id`, `role_id`, `menu_id`) VALUES (1, 1, 1);