diff --git a/apps/users/serializers/user.py b/apps/users/serializers/user.py index a2641e78e..13773d6b2 100644 --- a/apps/users/serializers/user.py +++ b/apps/users/serializers/user.py @@ -234,14 +234,15 @@ class UserManageSerializer(serializers.Serializer): post_records_handler=lambda u: UserInstanceSerializer(u).data) role_model = DatabaseModelManage.get_model("role_model") user_role_relation_model = DatabaseModelManage.get_model("workspace_user_role_mapping") - workspace_model = DatabaseModelManage.get_model("workspace_model") - workspace_mapping = {str(workspace_model.id): workspace_model.name for workspace_model in - workspace_model.objects.all()} def _get_user_roles(user_ids): - if not (role_model and user_role_relation_model): + workspace_model = DatabaseModelManage.get_model("workspace_model") + if not (role_model and user_role_relation_model and workspace_model): return {} + workspace_mapping = {str(workspace_model.id): workspace_model.name for workspace_model in + workspace_model.objects.all()} + # 获取所有相关角色关系,并预加载角色信息 user_role_relations = ( user_role_relation_model.objects diff --git a/ui/vite.config.ts b/ui/vite.config.ts index da9631c29..cf6d29fc6 100644 --- a/ui/vite.config.ts +++ b/ui/vite.config.ts @@ -36,8 +36,8 @@ export default defineConfig((conf: any) => { const ENV = loadEnv(mode, envDir) const proxyConf: Record = {} proxyConf['/admin/api'] = { - target: 'http://47.92.195.88:8080/', - // target: 'http://127.0.0.1:8080', + //target: 'http://47.92.195.88:8080/', + target: 'http://127.0.0.1:8080', changeOrigin: true, } proxyConf['/oss'] = {