}) {
const [title, setTitle] = useState('')
+ const [brand, setBrand] = useState('')
const [description, setDescription] = useState('')
const [workDate, setWorkDate] = useState(todayValue)
const [reviewerEmployeeId, setReviewerEmployeeId] = useState('')
@@ -267,6 +269,10 @@ export function WorkReviewSubmissionDialog({
setError('作品名称不能超过 120 个字')
return
}
+ if (isCreate && !brand.trim()) {
+ setError('请选择品牌')
+ return
+ }
if (isCreate && !workDate) {
setError('请选择作品日期')
return
@@ -306,6 +312,7 @@ export function WorkReviewSubmissionDialog({
...(isCreate
? {
title: title.trim(),
+ brand: brand.trim(),
description: description.trim(),
workDate,
reviewerEmployeeId,
@@ -393,6 +400,26 @@ export function WorkReviewSubmissionDialog({
className="h-11 rounded border border-[#cfd6e1] px-3 text-[14px] outline-none focus:border-[#0050cb] focus:ring-2 focus:ring-[#dcecff] disabled:bg-[#f2f4f7]"
/>
+
评审人 *
+ {project.brand && 品牌:{project.brand}}
提交人:{project.submitter.name}
作品日期:{formatDateOnly(project.workDate)}
最近提交:{formatDateTime(latestVersion.submittedAt)}
diff --git a/lib/__tests__/ding-workflow-sync.test.ts b/lib/__tests__/ding-workflow-sync.test.ts
index 50352494..f2e60a52 100644
--- a/lib/__tests__/ding-workflow-sync.test.ts
+++ b/lib/__tests__/ding-workflow-sync.test.ts
@@ -17,6 +17,7 @@ import {
isAllowedDingWorkflowProcessCode,
isDingWorkflowStartedOnOrAfterCutoff,
isDingWorkflowOngoing,
+ isDingWorkflowTerminal,
isDingWorkflowCompletedInRange,
isDingWorkflowDeliveryAssessmentInRange,
isDingWorkflowApprovedCompletion,
@@ -53,6 +54,12 @@ describe('ding workflow snapshot sync semantics', () => {
expect(isDingWorkflowOngoing(status, finishTime)).toBe(expected)
})
+ test('treats any upstream finish time as terminal even when status is stale', () => {
+ expect(isDingWorkflowTerminal('RUNNING', '2026-08-19 18:04:00')).toBe(true)
+ expect(isDingWorkflowTerminal('COMPLETED', null)).toBe(true)
+ expect(isDingWorkflowTerminal('RUNNING', null)).toBe(false)
+ })
+
it('interprets upstream report timestamps as Asia/Shanghai wall-clock values', () => {
expect(sourceWorkflowTimestampToIso('2026-08-20 10:30:00')).toBe('2026-08-20T02:30:00.000Z')
expect(sourceWorkflowTimestampToIso('2026-08-20T10:30:00Z')).toBe('2026-08-20T02:30:00.000Z')
diff --git a/lib/__tests__/work-review-upload-safety.test.ts b/lib/__tests__/work-review-upload-safety.test.ts
index 9279374f..6d70ed68 100644
--- a/lib/__tests__/work-review-upload-safety.test.ts
+++ b/lib/__tests__/work-review-upload-safety.test.ts
@@ -122,6 +122,7 @@ const finalReviewer = {
function makeProjectBody(uploadId = 'upload-work') {
return {
title: '测试作品',
+ brand: '亿家达',
workDate: '2026-08-12',
reviewerEmployeeId: manager.id,
processedImages: [makeProcessedImage(uploadId)],
@@ -222,6 +223,17 @@ describe('work review processed image persistence safety', () => {
])
})
+ test('rejects a new project without a brand before touching uploaded images', async () => {
+ const body = makeProjectBody()
+ delete (body as Record).brand
+
+ await expect(createWorkReviewProject(session, body)).rejects.toEqual(
+ new WorkReviewApiError('请填写品牌'),
+ )
+ expect(getOwnedUploadSession).not.toHaveBeenCalled()
+ expect(uploadFileToS3).not.toHaveBeenCalled()
+ })
+
test('fails closed and preserves S3 and source sessions when the commit readback is unavailable', async () => {
;(prisma.workReviewProject.create as jest.Mock).mockRejectedValue(new Error('connection lost'))
;(prisma.workReviewProject.findUnique as jest.Mock).mockRejectedValue(new Error('database unavailable'))
diff --git a/lib/ding-workflow-sync.ts b/lib/ding-workflow-sync.ts
index a6e8e937..eb46719e 100644
--- a/lib/ding-workflow-sync.ts
+++ b/lib/ding-workflow-sync.ts
@@ -1051,6 +1051,16 @@ export function isDingWorkflowOngoing(status: unknown, finishedAt: unknown): boo
&& !clean(finishedAt)
}
+/**
+ * 结束时间是上游审批的权威终态信号。部分报表同步会短暂保留旧的
+ * status(例如 RUNNING),但只要 finishTime 已写入,流程就不应再进入
+ * “进行中项目”。
+ */
+export function isDingWorkflowTerminal(status: unknown, finishedAt: unknown): boolean {
+ const normalizedStatus = String(status || '').trim().toUpperCase()
+ return TERMINAL_WORKFLOW_STATUSES.has(normalizedStatus) || Boolean(clean(finishedAt))
+}
+
export function sourceWorkflowTimestampToIso(value: unknown): string | null {
const normalized = clean(value)
if (!normalized) return null
@@ -1431,6 +1441,7 @@ async function fetchSourceWorkflows(
pool: ConnectionPool,
cursor: string | null,
changedWorkflowIds: string[] = [],
+ knownOngoingWorkflowIds: string[] = [],
) {
const request = pool.request()
const currentMonth = getShanghaiMonthRange()
@@ -1446,6 +1457,7 @@ async function fetchSourceWorkflows(
}).format(currentMonth.start)
request.input('cursor', mssql.NVarChar(64), cursor)
request.input('changedWorkflowIds', mssql.NVarChar(mssql.MAX), JSON.stringify(changedWorkflowIds))
+ request.input('knownOngoingWorkflowIds', mssql.NVarChar(mssql.MAX), JSON.stringify(knownOngoingWorkflowIds))
request.input('startedAtCutoff', mssql.NVarChar(64), DING_WORKFLOW_STARTED_AT_CUTOFF_LOCAL)
request.input('currentMonthStart', mssql.NVarChar(64), currentMonthStart)
DING_WORKFLOW_ALLOWED_PROCESS_CODES.forEach((processCode, index) => {
@@ -1482,6 +1494,15 @@ async function fetchSourceWorkflows(
SELECT CONVERT(nvarchar(255), [value])
FROM OPENJSON(@changedWorkflowIds)
)
+ -- Revalidate every locally ongoing workflow on each hourly sync. The
+ -- upstream mirror may update status/finishTime in place without
+ -- advancing updateAt or inserting a new task row; without this
+ -- branch a workflow completed in a prior month can remain ongoing
+ -- in the local snapshot indefinitely.
+ OR CONVERT(nvarchar(255), processInstanceId) IN (
+ SELECT CONVERT(nvarchar(255), [value])
+ FROM OPENJSON(@knownOngoingWorkflowIds)
+ )
OR UPPER(LTRIM(RTRIM(COALESCE(CONVERT(nvarchar(100), status), '')))) NOT IN ('COMPLETED', 'TERMINATED', 'CANCELED')
OR (
UPPER(LTRIM(RTRIM(COALESCE(CONVERT(nvarchar(100), status), '')))) IN ('COMPLETED', 'TERMINATED', 'CANCELED')
@@ -1720,7 +1741,7 @@ function buildSnapshotPayload(
const status = clean(row.status)
const sourceCreatedAtRaw = sourceWorkflowTimestampToIso(row.sourceCreatedAtRaw)
if (!processInstanceId || !status || !isDingWorkflowStartedOnOrAfterCutoff(row.sourceCreatedAtRaw)) return []
- const ongoing = isDingWorkflowOngoing(status, row.sourceFinishedAtRaw)
+ const ongoing = !isDingWorkflowTerminal(status, row.sourceFinishedAtRaw)
const task = taskByWorkflow.get(processInstanceId)
const scheme = schemeByWorkflow.get(processInstanceId)
const processCode = normalizeDingWorkflowProcessCode(row.processCode)
@@ -1929,10 +1950,19 @@ export async function syncDingWorkflowSnapshots() {
await pool.connect()
const sourceCursor = parseDingWorkflowSourceCursor(state.sourceCursorRaw)
const sourceDelta = await fetchSourceDeltaState(pool, sourceCursor)
+ const knownOngoingRows = await prisma.dingWorkflowSnapshot.findMany({
+ where: {
+ isOngoing: true,
+ processCode: { in: ALLOWED_PROCESS_CODE_VALUES },
+ },
+ select: { processInstanceId: true },
+ })
+ const knownOngoingWorkflowIds = knownOngoingRows.map((row) => row.processInstanceId)
const sourceRows = await fetchSourceWorkflows(
pool,
sourceDelta.requiresFullSync ? null : sourceCursor.workflowUpdatedAt,
sourceDelta.changedWorkflowIds,
+ knownOngoingWorkflowIds,
)
const workflowIds = sourceRows.flatMap((row) => {
const id = clean(row.processInstanceId)
diff --git a/lib/dingtalk-performance-session-constants.ts b/lib/dingtalk-performance-session-constants.ts
new file mode 100644
index 00000000..b7fea56a
--- /dev/null
+++ b/lib/dingtalk-performance-session-constants.ts
@@ -0,0 +1 @@
+export const DINGTALK_PERFORMANCE_SESSION_COOKIE = 'dingtalk-performance-session'
diff --git a/lib/dingtalk-performance-session.ts b/lib/dingtalk-performance-session.ts
index dec1913b..94ab9fda 100644
--- a/lib/dingtalk-performance-session.ts
+++ b/lib/dingtalk-performance-session.ts
@@ -1,4 +1,5 @@
import { createHmac, randomUUID, timingSafeEqual } from 'crypto'
+export { DINGTALK_PERFORMANCE_SESSION_COOKIE } from '@/lib/dingtalk-performance-session-constants'
export const DINGTALK_PERFORMANCE_SESSION_HEADER = 'x-performance-survey-dingtalk-session'
diff --git a/lib/upload-auth.ts b/lib/upload-auth.ts
index 5637e10b..71683a34 100644
--- a/lib/upload-auth.ts
+++ b/lib/upload-auth.ts
@@ -5,6 +5,7 @@ import {
DINGTALK_PERFORMANCE_SESSION_HEADER,
verifyDingtalkPerformanceSessionToken,
} from '@/lib/dingtalk-performance-session'
+import { DINGTALK_PERFORMANCE_SESSION_COOKIE } from '@/lib/dingtalk-performance-session-constants'
export async function getAuthenticatedUploadUserId(request: NextRequest): Promise {
const session = await getServerSession(authOptions)
@@ -14,6 +15,13 @@ export async function getAuthenticatedUploadUserId(request: NextRequest): Promis
const headerToken = request.headers.get(DINGTALK_PERFORMANCE_SESSION_HEADER)
const authorization = request.headers.get('authorization') || ''
const bearerToken = authorization.match(/^Bearer\s+(.+)$/i)?.[1]?.trim()
- const payload = verifyDingtalkPerformanceSessionToken(headerToken || bearerToken || null)
+ const cookieHeader = request.headers.get('cookie') || ''
+ const cookieToken = cookieHeader
+ .split(';')
+ .map((part) => part.trim())
+ .find((part) => part.startsWith(`${DINGTALK_PERFORMANCE_SESSION_COOKIE}=`))
+ ?.slice(DINGTALK_PERFORMANCE_SESSION_COOKIE.length + 1)
+ .trim()
+ const payload = verifyDingtalkPerformanceSessionToken(headerToken || bearerToken || cookieToken || null)
return payload?.userId ? String(payload.userId).trim() : null
}
diff --git a/lib/work-review-service.ts b/lib/work-review-service.ts
index a4ff41f1..ccf6de68 100644
--- a/lib/work-review-service.ts
+++ b/lib/work-review-service.ts
@@ -447,6 +447,7 @@ function serializeProject(ctx: Awaited>, project:
return {
id: project.id,
title: project.title,
+ brand: project.brand || null,
description: project.description,
workDate: project.workDate,
status: project.status,
@@ -553,6 +554,7 @@ export async function getWorkReviewBoard(session: Session | null, params?: URLSe
export type OngoingWorkReviewProjectListItem = {
id: string
title: string
+ brand?: string | null
description: string | null
status: 'pending_review' | 'revision_required'
workDate: string
@@ -576,6 +578,7 @@ export type OngoingWorkReviewProjectPage = {
export type FirstPassReviewProjectListItem = {
id: string
title: string
+ brand?: string | null
/** Present in API responses; optional for compatibility with older callers. */
description?: string | null
currentStatus: string
@@ -711,6 +714,7 @@ export async function getFirstPassReviewProjects(
select: {
id: true,
title: true,
+ brand: true,
description: true,
status: true,
latestVersion: true,
@@ -752,6 +756,7 @@ export async function getFirstPassReviewProjects(
return {
id: project.id,
title: project.title,
+ brand: project.brand || null,
description: project.description,
currentStatus: project.status,
latestVersion: project.latestVersion,
@@ -818,6 +823,7 @@ export async function getOngoingWorkReviewProjects(
select: {
id: true,
title: true,
+ brand: true,
description: true,
status: true,
workDate: true,
@@ -1396,6 +1402,9 @@ export async function createWorkReviewProject(session: Session | null, body: any
const title = clean(body?.title)
if (!title) throw new WorkReviewApiError('请填写作品名称')
if (title.length > 120) throw new WorkReviewApiError('作品名称不能超过 120 个字')
+ const brand = clean(body?.brand)
+ if (!brand) throw new WorkReviewApiError('请填写品牌')
+ if (brand.length > 80) throw new WorkReviewApiError('品牌不能超过 80 个字')
const description = clean(body?.description)
const submissionNote = clean(body?.submissionNote)
const workDate = parseWorkDate(body?.workDate)
@@ -1419,6 +1428,7 @@ export async function createWorkReviewProject(session: Session | null, body: any
data: {
id: projectId,
title,
+ brand,
description,
workDate,
submitterUserId: ctx.user.id,
diff --git a/middleware.test.ts b/middleware.test.ts
new file mode 100644
index 00000000..ca5f0316
--- /dev/null
+++ b/middleware.test.ts
@@ -0,0 +1,82 @@
+/** @jest-environment node */
+
+import { NextRequest } from 'next/server'
+import { getToken } from 'next-auth/jwt'
+import { middleware } from './middleware'
+import { createDingtalkPerformanceSessionToken } from '@/lib/dingtalk-performance-session'
+
+jest.mock('next-auth/jwt', () => ({
+ getToken: jest.fn(),
+}))
+
+describe('品牌中心门禁与钉钉绩效调研入口', () => {
+ const originalSecret = process.env.NEXTAUTH_SECRET
+
+ beforeAll(() => {
+ process.env.NEXTAUTH_SECRET = 'middleware-performance-test-secret'
+ })
+
+ afterAll(() => {
+ if (originalSecret === undefined) delete process.env.NEXTAUTH_SECRET
+ else process.env.NEXTAUTH_SECRET = originalSecret
+ })
+
+ beforeEach(() => {
+ jest.clearAllMocks()
+ ;(getToken as jest.Mock).mockResolvedValue(null)
+ })
+
+ test('带钉钉绩效会话 Cookie 时放行指定调研页面', async () => {
+ const token = createDingtalkPerformanceSessionToken({
+ id: 'external-user',
+ email: 'external@example.com',
+ username: '跨部门同事',
+ role: 'USER',
+ department: '运营中心',
+ })
+ const response = await middleware(new NextRequest(
+ 'https://sc.jiansun.vip/performance-survey/survey/survey-1?targetId=target-1',
+ { headers: { cookie: `dingtalk-performance-session=${token}` } },
+ ))
+
+ expect(response.status).toBe(200)
+ expect(response.headers.get('location')).toBeNull()
+ })
+
+ test('没有普通会话或钉钉绩效会话时仍跳转登录', async () => {
+ const response = await middleware(new NextRequest(
+ 'https://sc.jiansun.vip/performance-survey/survey/survey-1',
+ ))
+
+ expect(response.status).toBe(307)
+ expect(response.headers.get('location')).toBe('https://sc.jiansun.vip/login')
+ })
+
+ test('外部普通会话访问品牌中心页面仍进入素材库', async () => {
+ ;(getToken as jest.Mock).mockResolvedValue({ canAccessBrandCenter: false })
+ const response = await middleware(new NextRequest(
+ 'https://sc.jiansun.vip/workspaces/dashboard/core-metrics',
+ ))
+
+ expect(response.status).toBe(307)
+ expect(response.headers.get('location')).toBe('https://sc.jiansun.vip/assets/material-library')
+ })
+
+ test('外部普通会话带钉钉绩效会话时只放行绩效页面', async () => {
+ ;(getToken as jest.Mock).mockResolvedValue({ canAccessBrandCenter: false })
+ const token = createDingtalkPerformanceSessionToken({
+ id: 'external-user',
+ email: 'external@example.com',
+ username: '跨部门同事',
+ role: 'USER',
+ department: '运营中心',
+ })
+ const response = await middleware(new NextRequest(
+ 'https://sc.jiansun.vip/performance-survey/survey/survey-1',
+ { headers: { cookie: `dingtalk-performance-session=${token}` } },
+ ))
+
+ expect(response.status).toBe(200)
+ expect(response.headers.get('location')).toBeNull()
+ })
+})
diff --git a/middleware.ts b/middleware.ts
index 6824cc08..e21fb9c0 100644
--- a/middleware.ts
+++ b/middleware.ts
@@ -7,6 +7,7 @@ import {
} from '@/lib/auth-cookie'
import { shouldRedirectToStandaloneMaterialLibrary } from '@/lib/brand-center-access-policy'
import { getAllowedCorsOrigins, isAllowedCorsOrigin } from '@/lib/cors-origin'
+import { DINGTALK_PERFORMANCE_SESSION_COOKIE } from '@/lib/dingtalk-performance-session-constants'
const API_CORS_ALLOWED_HEADERS =
'X-CSRF-Token, X-Requested-With, Accept, Accept-Version, Content-Length, Content-MD5, Content-Type, Date, X-Api-Version, X-API-Key, Authorization, Cookie'
@@ -15,11 +16,59 @@ const DEPARTMENT_PAGE_PREFIXES = [
'/assets/material-library',
'/workspaces',
]
-
function isDepartmentPage(pathname: string): boolean {
return pathname === '/' || DEPARTMENT_PAGE_PREFIXES.some((prefix) => pathname.startsWith(prefix))
}
+function encodeBase64Url(bytes: Uint8Array) {
+ let binary = ''
+ bytes.forEach((byte) => { binary += String.fromCharCode(byte) })
+ return btoa(binary)
+ .replace(/=/g, '')
+ .replace(/\+/g, '-')
+ .replace(/\//g, '_')
+}
+
+function decodeBase64Url(value: string) {
+ const normalized = value.replace(/-/g, '+').replace(/_/g, '/')
+ const padding = normalized.length % 4 === 0 ? '' : '='.repeat(4 - (normalized.length % 4))
+ return atob(normalized + padding)
+}
+
+async function hasValidDingtalkPerformanceSession(request: NextRequest) {
+ const token = request.cookies.get(DINGTALK_PERFORMANCE_SESSION_COOKIE)?.value || ''
+ const secret = process.env.NEXTAUTH_SECRET || ''
+ const [encodedPayload, signature, extra] = token.split('.')
+ if (!secret || !encodedPayload || !signature || extra) return false
+
+ try {
+ const key = await crypto.subtle.importKey(
+ 'raw',
+ new TextEncoder().encode(secret),
+ { name: 'HMAC', hash: 'SHA-256' },
+ false,
+ ['sign'],
+ )
+ const expectedSignature = encodeBase64Url(new Uint8Array(
+ await crypto.subtle.sign('HMAC', key, new TextEncoder().encode(encodedPayload)),
+ ))
+ if (expectedSignature !== signature) return false
+
+ const payload = JSON.parse(decodeBase64Url(encodedPayload)) as Record
+ return (
+ payload.v === 1
+ && payload.purpose === 'performance-survey'
+ && typeof payload.userId === 'string'
+ && typeof payload.email === 'string'
+ && typeof payload.name === 'string'
+ && typeof payload.exp === 'number'
+ && payload.exp > Math.floor(Date.now() / 1000)
+ )
+ } catch {
+ return false
+ }
+}
+
// 注意:不在middleware中启动内存监控
// middleware使用Edge Runtime,不支持Node.js API
// 内存监控会在lib/memory-monitor.ts模块加载时自动启动(仅生产环境)
@@ -90,6 +139,11 @@ export async function middleware(request: NextRequest) {
pathname.startsWith('/work-review') ||
pathname.startsWith('/teacher')
) {
+ const isPerformanceSurveyPath =
+ pathname === '/performance-survey' || pathname.startsWith('/performance-survey/')
+ const hasDingtalkPerformanceSession = isPerformanceSurveyPath
+ ? await hasValidDingtalkPerformanceSession(request)
+ : false
const preferredSecureCookie = resolveSecureAuthCookieFromRequest(request)
const cookieCandidates = getAuthSessionCookieCandidates(preferredSecureCookie)
let token = null
@@ -107,7 +161,7 @@ export async function middleware(request: NextRequest) {
}
}
- if (!token) {
+ if (!token && !(isPerformanceSurveyPath && hasDingtalkPerformanceSession)) {
const url = new URL('/login', request.url)
const redirectResponse = NextResponse.redirect(url)
// 为重定向响应也添加缓存控制头
@@ -117,7 +171,11 @@ export async function middleware(request: NextRequest) {
return redirectResponse
}
- if (shouldRedirectToStandaloneMaterialLibrary(pathname, (token as any).canAccessBrandCenter)) {
+ if (
+ token
+ && !(isPerformanceSurveyPath && hasDingtalkPerformanceSession)
+ && shouldRedirectToStandaloneMaterialLibrary(pathname, (token as any).canAccessBrandCenter)
+ ) {
const url = new URL('/assets/material-library', request.url)
const redirectResponse = NextResponse.redirect(url)
redirectResponse.headers.set('Cache-Control', 'private, no-store, no-cache, must-revalidate, proxy-revalidate, max-age=0')
diff --git a/prisma/migrations/20260903_add_work_review_brand/migration.sql b/prisma/migrations/20260903_add_work_review_brand/migration.sql
new file mode 100644
index 00000000..0c914811
--- /dev/null
+++ b/prisma/migrations/20260903_add_work_review_brand/migration.sql
@@ -0,0 +1,2 @@
+ALTER TABLE "work_review_projects"
+ ADD COLUMN IF NOT EXISTS "brand" TEXT;
diff --git a/prisma/schema.prisma b/prisma/schema.prisma
index 675243f0..c37c6e0f 100644
--- a/prisma/schema.prisma
+++ b/prisma/schema.prisma
@@ -1212,6 +1212,7 @@ model PerformanceSurveyConfigAuditLog {
model WorkReviewProject {
id String @id @default(uuid())
title String
+ brand String?
description String?
workDate DateTime @db.Date @map("work_date")
submitterUserId String @map("submitter_user_id")