From 34981c30a78e8bbd7791131059a9210f9928b62c Mon Sep 17 00:00:00 2001
From: 刘光辉 <347230014@qq.com>
Date: 星期四, 17 九月 2026 09:24:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master

---
 jnpf-dms/jnpf-dms-biz/src/test/java/jnpf/dmsPermission/DmsCurrentIdentityTest.java |   34 ++++++++++++++++++++++++++++++++++
 1 files changed, 34 insertions(+), 0 deletions(-)

diff --git a/jnpf-dms/jnpf-dms-biz/src/test/java/jnpf/dmsPermission/DmsCurrentIdentityTest.java b/jnpf-dms/jnpf-dms-biz/src/test/java/jnpf/dmsPermission/DmsCurrentIdentityTest.java
new file mode 100644
index 0000000..aaa09a2
--- /dev/null
+++ b/jnpf-dms/jnpf-dms-biz/src/test/java/jnpf/dmsPermission/DmsCurrentIdentityTest.java
@@ -0,0 +1,34 @@
+package jnpf.dmsPermission;
+
+import jnpf.base.UserInfo;
+import jnpf.permission.RoleApi;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Mockito.mock;
+
+class DmsCurrentIdentityTest {
+    private final DmsCurrentIdentity identity = new DmsCurrentIdentity(
+            mock(RoleApi.class), new DmsPermissionProperties());
+
+    @Test
+    void usesPlatformSingleTenantIdWhenSessionTenantIsBlank() {
+        UserInfo user = user("  ");
+
+        assertEquals("0", identity.tenantId(user));
+    }
+
+    @Test
+    void keepsExplicitTenantIdForMultiTenantSessions() {
+        UserInfo user = user(" tenant-1 ");
+
+        assertEquals("tenant-1", identity.tenantId(user));
+    }
+
+    private UserInfo user(String tenantId) {
+        UserInfo user = new UserInfo();
+        user.setUserId("user-1");
+        user.setTenantId(tenantId);
+        return user;
+    }
+}

--
Gitblit v1.8.0