fix(workspace): 兼容成员ID匹配与我相关任务

This commit is contained in:
2026-07-06 11:22:43 +08:00
parent 84344e81f6
commit b170ac9caf
4 changed files with 56 additions and 18 deletions

View File

@@ -77,8 +77,10 @@ export default function WorkspacePage() {
useEffect(() => { fetchWorklogs(); }, [fetchWorklogs]);
useEffect(() => { fetchActivities(); }, [fetchActivities]);
const userId = user?.id ?? '';
const userName = user?.name ?? '';
const workspaceUserKey = userName || user?.id || '';
const workspaceUserKey = userId || userName;
const workspaceUserRefs = useMemo(() => [userName, userId].filter(Boolean), [userId, userName]);
useEffect(() => {
if (!workspaceUserKey.trim()) {
@@ -151,7 +153,7 @@ export default function WorkspacePage() {
const workItems = useMemo(() =>
aggregateWorkItems(
userName,
workspaceUserRefs,
workspaceCollections.versionPlans,
workspaceCollections.devTasks,
workspaceCollections.testCases,
@@ -159,7 +161,7 @@ export default function WorkspacePage() {
versionMap,
requirementVersionMap,
),
[userName, workspaceCollections, versionMap, requirementVersionMap]
[workspaceUserRefs, workspaceCollections, versionMap, requirementVersionMap]
);
const pendingCountByVersion = useMemo(() => getWorkspacePendingCountByVersion(workItems), [workItems]);
@@ -198,10 +200,10 @@ export default function WorkspacePage() {
activities,
worklogs,
workItems,
userId: userName,
userId: userName || userId,
date: today,
}),
[activities, worklogs, workItems, userName, today]
[activities, userId, worklogs, workItems, userName, today]
);
// 待办数量按 tab 分(受 version filter 影响)