feat: 新增备课模块并修复全模块 P0/P1/P2 缺陷
Some checks failed
Security / deep-security-scan (push) Failing after 20m5s
DR Drill / dr-drill (push) Failing after 1m31s
CI / scheduled-backup (push) Failing after 1m31s
CI / backup-verify (push) Has been skipped
CI / weekly-dr-drill (push) Failing after 0s
CI / build-deploy (push) Has been cancelled
CI / security-scan (push) Has been cancelled
Some checks failed
Security / deep-security-scan (push) Failing after 20m5s
DR Drill / dr-drill (push) Failing after 1m31s
CI / scheduled-backup (push) Failing after 1m31s
CI / backup-verify (push) Has been skipped
CI / weekly-dr-drill (push) Failing after 0s
CI / build-deploy (push) Has been cancelled
CI / security-scan (push) Has been cancelled
主要变更: - 新增 lesson-preparation 模块: 备课编辑器、节点编辑、AI 建议、知识点选择、版本历史、作业发布 - 新增 shared 通用组件: charts/question-bank-filters/schedule-list/ui (chip-nav/filter-bar/page-header/stat-card/stat-item) - 新增 student/admin 端 loading.tsx 与 error.tsx, 优化加载与错误态体验 - 新增 teacher/lesson-plans 页面 (列表/新建/编辑) - 新增 drizzle 迁移 0002_tiny_lionheart 及 snapshot - 新增 textbooks/schema.ts 与 exams/utils/normalize-structure.ts - 修复 Tiptap v3 SSR hydration 崩溃 (rich-text-block immediatelyRender: false) - 重构多模块 data-access/actions/组件, 修复权限校验与类型规范 - 同步架构文档 004/005 反映新增模块、导出、依赖关系 - 归档 bugs/* 测试报告与 e2e 测试脚本 (admin/parent/student/teacher web_test)
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
import "server-only"
|
||||
|
||||
import { and, asc, desc, eq, isNull, or, type SQL } from "drizzle-orm"
|
||||
import { and, asc, desc, eq, inArray, isNull, or, type SQL } from "drizzle-orm"
|
||||
import { createId } from "@paralleldrive/cuid2"
|
||||
|
||||
import { db } from "@/shared/db"
|
||||
@@ -111,7 +111,6 @@ export async function getScheduleChanges(
|
||||
change: scheduleChanges,
|
||||
className: classes.name,
|
||||
originalTeacherName: users.name,
|
||||
requesterName: users.name,
|
||||
})
|
||||
.from(scheduleChanges)
|
||||
.innerJoin(classes, eq(classes.id, scheduleChanges.classId))
|
||||
@@ -132,15 +131,10 @@ export async function getScheduleChanges(
|
||||
|
||||
const userMap = new Map<string, string>()
|
||||
if (userIds.length > 0) {
|
||||
const firstId = userIds[0]
|
||||
const userRows = await db
|
||||
.select({ id: users.id, name: users.name })
|
||||
.from(users)
|
||||
.where(
|
||||
userIds.length === 1 && firstId
|
||||
? eq(users.id, firstId)
|
||||
: or(...userIds.map((id) => eq(users.id, id)))
|
||||
)
|
||||
.where(inArray(users.id, userIds))
|
||||
for (const u of userRows) userMap.set(u.id, u.name ?? "Unknown")
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user