From 869812d87b3146a6cd4b55c2731f7603da967ebc Mon Sep 17 00:00:00 2001
From: shaohuzhang1 <80892890+shaohuzhang1@users.noreply.github.com>
Date: Tue, 24 Jun 2025 10:29:37 +0800
Subject: [PATCH] fix: application list (#3359)

---
 apps/application/serializers/application.py | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/apps/application/serializers/application.py b/apps/application/serializers/application.py
index eb63a99be..3d61940be 100644
--- a/apps/application/serializers/application.py
+++ b/apps/application/serializers/application.py
@@ -318,15 +318,16 @@ class Query(serializers.Serializer):
         application_custom_sql_query_set = application_query_set
         application_query_set = application_query_set.order_by("-update_time")
         workspace_user_role_mapping_model = DatabaseModelManage.get_model('workspace_user_role_mapping')
-        return {
+
+        return {'folder_query_set': folder_query_set,
+                'application_query_set': application_query_set,
+                'user_query_set': QuerySet(
+                    workspace_user_role_mapping_model).filter(
+                    user_id=user_id, workspace_id=workspace_id)} if (not workspace_manage and is_x_pack_ee) else {
             'folder_query_set': folder_query_set,
             'application_query_set': application_query_set,
             'application_custom_sql': application_custom_sql_query_set
-        } if (workspace_manage and not is_x_pack_ee) else {'folder_query_set': folder_query_set,
-                                                       'application_query_set': application_query_set,
-                                                       'user_query_set': QuerySet(
-                                                           workspace_user_role_mapping_model).filter(
-                                                           user_id=user_id, workspace_id=workspace_id)}
+        }
 
     @staticmethod
     def is_x_pack_ee():