From 0a2b763d055e1b688ed12e0150a04591e7ecb934 Mon Sep 17 00:00:00 2001
From: "Crane.z" <1481445951@qq.com>
Date: Fri, 6 Mar 2026 11:34:14 +0800
Subject: [PATCH] fix: resolve login redirect loop when user only belongs to
 SYSTEM organization

---
 src/utils/jms/org.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/utils/jms/org.js b/src/utils/jms/org.js
index f64222f5b..913bf07e8 100644
--- a/src/utils/jms/org.js
+++ b/src/utils/jms/org.js
@@ -17,7 +17,13 @@ function getPropOrg() {
   if (defaultOrg) {
     return defaultOrg
   }
-  return orgs.filter(item => !item['is_root'] && !item['is_system'])[0]
+  // 优先选择非 SYSTEM 和非 ROOT 的组织
+  const nonSystemOrg = orgs.find(item => !item['is_root'] && !item['is_system'])
+  if (nonSystemOrg) {
+    return nonSystemOrg
+  }
+  // 如果用户只有 SYSTEM 组织，则允许使用 SYSTEM 组织，避免无限循环
+  return orgs[0]
 }
 
 async function change2PropOrg() {