From 5da96a81174a2e8717a16d013ea4aebec869c04e Mon Sep 17 00:00:00 2001
From: hongqiwei <1143662660@qq.com>
Date: Wed, 4 Nov 2026 14:27:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=80=E6=9C=89=E5=8D=8F=E4=BC=9A=E3=80=81?=
 =?UTF-8?q?=E7=A4=BE=E5=9B=A2=E6=94=B9=E6=88=90=E4=BF=B1=E4=B9=90=E9=83=A8?=
 =?UTF-8?q?=EF=BC=9B=E6=AF=8F=E5=A4=A9=E5=AE=9A=E6=97=B6=E6=8B=89=E5=8F=96?=
 =?UTF-8?q?=E5=85=A8=E9=87=8F=E6=9B=B4=E6=96=B0=E4=BA=BA=E5=91=98=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=EF=BC=88=E5=9C=A8=E8=81=8C=E5=9C=A8=E5=B2=97=EF=BC=8C?=
 =?UTF-8?q?=E9=9D=9E=E4=B8=B4=E6=97=B6=E8=81=98=E7=94=A8=E4=BA=BA=E5=91=98?=
 =?UTF-8?q?=E8=AE=BE=E4=B8=BA=E4=BC=9A=E5=91=98=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/layouts/v4/home/index.html          | 12 ++++++++++-
 .../resources/views/layouts/v4/home/user.js   | 20 +++++++++----------
 2 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/src/main/resources/views/layouts/v4/home/index.html b/src/main/resources/views/layouts/v4/home/index.html
index bb0f0e8..e115f11 100644
--- a/src/main/resources/views/layouts/v4/home/index.html
+++ b/src/main/resources/views/layouts/v4/home/index.html
@@ -73,7 +73,17 @@ layout("/layouts/v4/baseLayout.html"){
     </div>
 
     <div class="" style="padding-bottom: 20px">
-	    <user></user>
+	    <!-- 用户资料只在 HTML 中由 Beetl 渲染，避免与 JS 模板字符串的插值语法冲突。 -->
+        <user
+                user-name="${@auth.getPrincipalProperty('username'),escape}"
+                login-name="${@auth.getPrincipalProperty('loginname'),escape}"
+                <!--#if(!isEmpty(@auth.getPrincipalProperty('unit'))){#-->
+                unit-name="${@auth.getPrincipalProperty('unit').getName(),escape}"
+                <!--#}#-->
+                <!--#if(!isEmpty(@auth.getPrincipalProperty('union'))){#-->
+                union-name="${@auth.getPrincipalProperty('union').getName(),escape}"
+                <!--#}#-->
+        ></user>
 
 	    <div class="home-grid">
 		    <div class="act-card">
diff --git a/src/main/resources/views/layouts/v4/home/user.js b/src/main/resources/views/layouts/v4/home/user.js
index 1343e0c..5fe9580 100644
--- a/src/main/resources/views/layouts/v4/home/user.js
+++ b/src/main/resources/views/layouts/v4/home/user.js
@@ -6,14 +6,14 @@ const user = {
 			    <!-- 左侧：用户信息卡片 -->
 			    <div class="user-info-card">
 				    <div class="user-details">
-					    <div class="user-name">${@auth.getPrincipalProperty('username')}</div>
+					    <div class="user-name">{{ userName }}</div>
 					    
 					    <div class="user-meta-grid">
 						    <div class="meta-row">
 							    <span class="meta-icon">🆔</span>
 							    <div>
 								    <span class="meta-label">工号</span>
-								    <span class="meta-value">${@auth.getPrincipalProperty('loginname')}</span>
+								    <span class="meta-value">{{ loginName }}</span>
 							    </div>
 						    </div>
 						    
@@ -22,14 +22,7 @@ const user = {
 							    <div>
 								    <span class="meta-label">单位信息</span>
 								    <span class="meta-value">
-                                        <!--#if(!isEmpty(@auth.getPrincipalProperty('unit'))){#-->
-                                            ${@auth.getPrincipalProperty('unit').getName()}
-									    <!--#}#-->
-									    (
-									    <!--#if(!isEmpty(@auth.getPrincipalProperty('union'))){#-->
-                                            ${@auth.getPrincipalProperty('union').getName()}
-									    <!--#}#-->
-                                        )
+                                        {{ unitName }} ({{ unionName }})
                                       </span>
 							    </div>
 						    </div>
@@ -113,6 +106,13 @@ const user = {
 		    </div>
 	    </div>
     `,
+    // 用户资料由首页经过 HTML 转义后传入；缺少单位或工会时使用空字符串。
+    props: {
+        userName: { type: String, default: '' },
+        loginName: { type: String, default: '' },
+        unitName: { type: String, default: '' },
+        unionName: { type: String, default: '' }
+    },
     mixins: [initTableMixins],
     data() {
         return {