From 6a58a55997914c2f3f57855b3f7b207578e6734a Mon Sep 17 00:00:00 2001
From: hailin <hailin.zhao@gdzx.xyz>
Date: Wed, 7 Jan 2026 23:19:09 -0800
Subject: [PATCH] =?UTF-8?q?fix(admin-web):=20=E6=9C=88=E5=BA=A6=E8=80=83?=
 =?UTF-8?q?=E6=A0=B8=E6=8C=89=E6=8E=88=E6=9D=83ID=E8=BF=87=E6=BB=A4?=
 =?UTF-8?q?=E5=B9=B6=E6=98=BE=E7=A4=BA=E5=8C=BA=E5=9F=9F=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 改用 authorization_id 匹配考核记录，而非 roleType
- 同类型但已撤销的角色考核不再显示
- 新增"区域"列显示角色对应的区域名称（如胜门、广州）

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
---
 .../src/app/(dashboard)/users/[id]/page.tsx    | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/frontend/admin-web/src/app/(dashboard)/users/[id]/page.tsx b/frontend/admin-web/src/app/(dashboard)/users/[id]/page.tsx
index df2d9f66..d7c6d304 100644
--- a/frontend/admin-web/src/app/(dashboard)/users/[id]/page.tsx
+++ b/frontend/admin-web/src/app/(dashboard)/users/[id]/page.tsx
@@ -714,15 +714,21 @@ export default function UserDetailPage() {
                   <div className={styles.authTab__assessments}>
                     <h3>月度考核记录</h3>
                     {(() => {
-                      // 只显示用户实际拥有且未撤销角色的考核记录
-                      const activeRoleTypes = new Set(
+                      // 只显示用户实际拥有且未撤销角色的考核记录（按 authorization_id 匹配）
+                      const activeRoleIds = new Set(
                         authData.roles
                           .filter(r => r.status !== 'REVOKED')
-                          .map(r => r.roleType)
+                          .map(r => r.id)
                       );
                       const filteredAssessments = authData.assessments.filter(
-                        a => activeRoleTypes.has(a.roleType)
+                        a => activeRoleIds.has(a.authorizationId)
                       );
+
+                      // 创建角色ID到区域名称的映射，用于显示角色的区域信息
+                      const roleIdToRegion = new Map(
+                        authData.roles.map(r => [r.id, r.regionName])
+                      );
+
                       return filteredAssessments.length === 0 ? (
                         <div className={styles.authTab__empty}>暂无考核记录</div>
                       ) : (
@@ -730,6 +736,7 @@ export default function UserDetailPage() {
                           <div className={styles.ledgerTable__header}>
                             <div className={styles.ledgerTable__cell}>考核月份</div>
                             <div className={styles.ledgerTable__cell}>角色</div>
+                            <div className={styles.ledgerTable__cell}>区域</div>
                             <div className={styles.ledgerTable__cell}>月度目标/完成</div>
                             <div className={styles.ledgerTable__cell}>累计目标/完成</div>
                             <div className={styles.ledgerTable__cell}>结果</div>
@@ -741,6 +748,9 @@ export default function UserDetailPage() {
                             <div className={styles.ledgerTable__cell}>
                               {roleTypeLabels[assessment.roleType] || assessment.roleType}
                             </div>
+                            <div className={styles.ledgerTable__cell}>
+                              {roleIdToRegion.get(assessment.authorizationId) || getRegionName(assessment.regionCode)}
+                            </div>
                             <div className={styles.ledgerTable__cell}>
                               {formatNumber(assessment.monthlyCompleted)} / {formatNumber(assessment.monthlyTarget)}
                             </div>