From 5e9a7583a3426d46bc6d3dc2646b1a1fca66ea9c Mon Sep 17 00:00:00 2001
From: shaohuzhang1 <80892890+shaohuzhang1@users.noreply.github.com>
Date: Wed, 18 Jun 2025 12:14:40 +0800
Subject: [PATCH] fix: ui 404 (#3290)

---
 apps/common/auth/handle/impl/user_token.py | 7 +++++--
 apps/users/serializers/user.py             | 2 +-
 ui/src/router/modules/1application.ts      | 2 +-
 ui/src/router/modules/2knowledge.ts        | 4 ++--
 ui/src/stores/modules/user.ts              | 2 +-
 5 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/apps/common/auth/handle/impl/user_token.py b/apps/common/auth/handle/impl/user_token.py
index c84ffaa4e..42821ed04 100644
--- a/apps/common/auth/handle/impl/user_token.py
+++ b/apps/common/auth/handle/impl/user_token.py
@@ -109,7 +109,7 @@ def get_workspace_resource_permission_list_by_workspace_user_permission(
     @return: 工作空间用户资源的权限列表
     """
 
-    role_permission_mapping_list = [role_permission_mapping_dict.get(workspace_user_role_mapping.role_id) for
+    role_permission_mapping_list = [role_permission_mapping_dict.get(workspace_user_role_mapping.role_id, []) for
                                     workspace_user_role_mapping in
                                     workspace_user_role_mapping_dict.get(
                                         workspace_user_resource_permission.workspace_id)]
@@ -155,7 +155,9 @@ def get_permission_list(user,
             role_permission_mapping_list = QuerySet(role_permission_mapping_model).filter(
                 role_id__in=[workspace_user_role_mapping.role_id for workspace_user_role_mapping in
                              workspace_user_role_mapping_list])
-            role_permission_mapping_dict = group_by(role_permission_mapping_list, lambda item: item.role_id)
+            system_role_permission_mapping_list = get_default_role_permission_mapping_list()
+            role_permission_mapping_dict = group_by(
+                [*role_permission_mapping_list, *system_role_permission_mapping_list], lambda item: item.role_id)
 
             workspace_user_permission_list = QuerySet(WorkspaceUserResourcePermission).filter(
                 workspace_id__in=[workspace_user_role.workspace_id for workspace_user_role in
@@ -224,6 +226,7 @@ def get_role_list(user,
                                  workspace_user_role_mapping in
                                  workspace_user_role_mapping_list] + [user.role]
             cache.set(key, workspace_list, version=version)
+            return workspace_list
         else:
             role_list = [user.role]
             if user.role == RoleConstants.ADMIN.value.__str__():
diff --git a/apps/users/serializers/user.py b/apps/users/serializers/user.py
index aa79f9d25..e7a849e9a 100644
--- a/apps/users/serializers/user.py
+++ b/apps/users/serializers/user.py
@@ -67,7 +67,7 @@ def is_workspace_manage(user_id: str, workspace_id: str):
     if is_x_pack_ee:
         return QuerySet(workspace_user_role_mapping_model).select_related('role', 'user').filter(
             workspace_id=workspace_id, user_id=user_id,
-            role_type=RoleConstants.WORKSPACE_MANAGE.value.__str__()).exists()
+            role=RoleConstants.WORKSPACE_MANAGE.value.__str__()).exists()
     return QuerySet(User).filter(id=user_id, role=RoleConstants.ADMIN.value.__str__()).exists()
 
 
diff --git a/ui/src/router/modules/1application.ts b/ui/src/router/modules/1application.ts
index 71ce326e2..a412019f1 100644
--- a/ui/src/router/modules/1application.ts
+++ b/ui/src/router/modules/1application.ts
@@ -3,7 +3,7 @@ import { ComplexPermission } from '@/utils/permission/type'
 const applicationRouter = {
   path: '/application',
   name: 'application',
-  meta: { title: 'views.application.title', permission: 'APPLICATION:READ' },
+  meta: { title: 'views.application.title' },
   redirect: '/application',
   component: () => import('@/layout/layout-template/SimpleLayout.vue'),
   children: [
diff --git a/ui/src/router/modules/2knowledge.ts b/ui/src/router/modules/2knowledge.ts
index 3fc6b1a1b..b9ba743ff 100644
--- a/ui/src/router/modules/2knowledge.ts
+++ b/ui/src/router/modules/2knowledge.ts
@@ -1,7 +1,7 @@
 const ModelRouter = {
   path: '/knowledge',
   name: 'knowledge',
-  meta: { title: 'views.knowledge.title', permission: 'KNOWLEDGE:READ' },
+  meta: { title: 'views.knowledge.title' },
   redirect: '/knowledge',
   component: () => import('@/layout/layout-template/SimpleLayout.vue'),
   children: [
@@ -19,7 +19,7 @@ const ModelRouter = {
       meta: { activeMenu: '/knowledge' },
       component: () => import('@/views/document/UploadDocument.vue'),
       hidden: true,
-    }
+    },
   ],
 }
 
diff --git a/ui/src/stores/modules/user.ts b/ui/src/stores/modules/user.ts
index 79f58d60f..4df662ced 100644
--- a/ui/src/stores/modules/user.ts
+++ b/ui/src/stores/modules/user.ts
@@ -111,7 +111,7 @@ const useUserStore = defineStore('user', {
       return this.edition == 'PE' && this.license_is_valid
     },
     isEE() {
-      return this.edition == 'EE' && this.license_is_valid
+      return this.edition == 'EE'
     },
     changeUserType(num: number, token?: string) {
       this.userType = num