Fix missing table in alembic migration (#920)

Author: wu-clan

backend/app/admin/crud/crud_data_scope.py

@@ -5,8 +5,7 @@
 from sqlalchemy.ext.asyncio import AsyncSession
 from sqlalchemy_crud_plus import CRUDPlus, JoinConfig
 
-from backend.app.admin.model import DataRule, DataScope
-from backend.app.admin.model.m2m import data_scope_rule
+from backend.app.admin.model import DataRule, DataScope, data_scope_rule
 from backend.app.admin.schema.data_scope import (
     CreateDataScopeParam,
     CreateDataScopeRuleParam,

backend/app/admin/crud/crud_menu.py

@@ -4,8 +4,7 @@
 from sqlalchemy.ext.asyncio import AsyncSession
 from sqlalchemy_crud_plus import CRUDPlus
 
-from backend.app.admin.model import Menu
-from backend.app.admin.model.m2m import role_menu
+from backend.app.admin.model import Menu, role_menu
 from backend.app.admin.schema.menu import CreateMenuParam, UpdateMenuParam
 
 

backend/app/admin/crud/crud_role.py

@@ -5,8 +5,7 @@
 from sqlalchemy.ext.asyncio import AsyncSession
 from sqlalchemy_crud_plus import CRUDPlus, JoinConfig
 
-from backend.app.admin.model import DataScope, Menu, Role
-from backend.app.admin.model.m2m import role_data_scope, role_menu
+from backend.app.admin.model import DataScope, Menu, Role, role_data_scope, role_menu
 from backend.app.admin.schema.role import (
     CreateRoleMenuParam,
     CreateRoleParam,

backend/app/admin/crud/crud_user.py

@@ -6,8 +6,18 @@
 from sqlalchemy.ext.asyncio import AsyncSession
 from sqlalchemy_crud_plus import CRUDPlus, JoinConfig
 
-from backend.app.admin.model import DataRule, DataScope, Dept, Menu, Role, User
-from backend.app.admin.model.m2m import data_scope_rule, role_data_scope, role_menu, user_role
+from backend.app.admin.model import (
+    DataRule,
+    DataScope,
+    Dept,
+    Menu,
+    Role,
+    User,
+    data_scope_rule,
+    role_data_scope,
+    role_menu,
+    user_role,
+)
 from backend.app.admin.schema.user import (
     AddOAuth2UserParam,
     AddUserParam,

backend/app/admin/model/__init__.py

@@ -2,6 +2,10 @@
 from backend.app.admin.model.data_scope import DataScope as DataScope
 from backend.app.admin.model.dept import Dept as Dept
 from backend.app.admin.model.login_log import LoginLog as LoginLog
+from backend.app.admin.model.m2m import data_scope_rule as data_scope_rule
+from backend.app.admin.model.m2m import role_data_scope as role_data_scope
+from backend.app.admin.model.m2m import role_menu as role_menu
+from backend.app.admin.model.m2m import user_role as user_role
 from backend.app.admin.model.menu import Menu as Menu
 from backend.app.admin.model.opera_log import OperaLog as OperaLog
 from backend.app.admin.model.role import Role as Role

backend/app/admin/utils/cache.py

@@ -3,7 +3,7 @@
 from sqlalchemy import select
 from sqlalchemy.ext.asyncio import AsyncSession
 
-from backend.app.admin.model.m2m import data_scope_rule, role_data_scope, role_menu, user_role
+from backend.app.admin.model import data_scope_rule, role_data_scope, role_menu, user_role
 from backend.core.conf import settings
 from backend.database.redis import redis_client