From 3b24dca9358b704c9fd24d35cfbb95f4e9c1c039 Mon Sep 17 00:00:00 2001
From: Wu Clan <jianhengwu0407@gmail.com>
Date: Fri, 14 Nov 2025 17:55:15 +0800
Subject: [PATCH] Fix missing table in alembic migration (#920)

---
 backend/app/admin/crud/crud_data_scope.py |  3 +--
 backend/app/admin/crud/crud_menu.py       |  3 +--
 backend/app/admin/crud/crud_role.py       |  3 +--
 backend/app/admin/crud/crud_user.py       | 14 ++++++++++++--
 backend/app/admin/model/__init__.py       |  4 ++++
 backend/app/admin/utils/cache.py          |  2 +-
 6 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/backend/app/admin/crud/crud_data_scope.py b/backend/app/admin/crud/crud_data_scope.py
index 7a43ee07..ccbf409d 100644
--- a/backend/app/admin/crud/crud_data_scope.py
+++ b/backend/app/admin/crud/crud_data_scope.py
@@ -5,8 +5,7 @@ from sqlalchemy import Select, delete, insert
 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,
diff --git a/backend/app/admin/crud/crud_menu.py b/backend/app/admin/crud/crud_menu.py
index 3764511b..e7e6a0cc 100644
--- a/backend/app/admin/crud/crud_menu.py
+++ b/backend/app/admin/crud/crud_menu.py
@@ -4,8 +4,7 @@ from sqlalchemy import delete
 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
 
 
diff --git a/backend/app/admin/crud/crud_role.py b/backend/app/admin/crud/crud_role.py
index f34484df..775b5916 100644
--- a/backend/app/admin/crud/crud_role.py
+++ b/backend/app/admin/crud/crud_role.py
@@ -5,8 +5,7 @@ from sqlalchemy import Select, delete, insert, select
 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,
diff --git a/backend/app/admin/crud/crud_user.py b/backend/app/admin/crud/crud_user.py
index ee008141..f6023b55 100644
--- a/backend/app/admin/crud/crud_user.py
+++ b/backend/app/admin/crud/crud_user.py
@@ -6,8 +6,18 @@ from sqlalchemy import Select, delete, insert, select
 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,
diff --git a/backend/app/admin/model/__init__.py b/backend/app/admin/model/__init__.py
index d173c188..7ade9393 100644
--- a/backend/app/admin/model/__init__.py
+++ b/backend/app/admin/model/__init__.py
@@ -2,6 +2,10 @@ from backend.app.admin.model.data_rule import DataRule as DataRule
 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
diff --git a/backend/app/admin/utils/cache.py b/backend/app/admin/utils/cache.py
index eea7325b..ba1d708f 100644
--- a/backend/app/admin/utils/cache.py
+++ b/backend/app/admin/utils/cache.py
@@ -3,7 +3,7 @@ from collections.abc import Sequence
 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