diff --git a/client/src/api/index.ts b/client/src/api/index.ts index 6becb56..2b570cb 100644 --- a/client/src/api/index.ts +++ b/client/src/api/index.ts @@ -66,11 +66,7 @@ export const usersApi = { results: Array<{ idx: number; ok: boolean; id?: number; error?: string; item: any }>; }>('/users/batch', { items }).then(r => r.data), batchRemove: (ids: number[]) => - api.request<{ ok: boolean; deleted: number; total: number }>({ - url: '/users/batch', - method: 'DELETE', - data: { ids }, - }).then(r => r.data), + api.post<{ ok: boolean; deleted: number; total: number }>('/users/batch-remove', { ids }).then(r => r.data), }; export const activitiesApi = { diff --git a/client/src/pages/admin/Users.tsx b/client/src/pages/admin/Users.tsx index e244955..0ed9a24 100644 --- a/client/src/pages/admin/Users.tsx +++ b/client/src/pages/admin/Users.tsx @@ -165,11 +165,15 @@ export default function Users() { if (!confirm(`确认删除选中的 ${selectedCount} 名部员?相关的时长登记也会一并删除,此操作不可撤销。`)) return; try { const result = await usersApi.batchRemove(Array.from(selectedIds)); - alert(`批量删除完成:共提交 ${result.total} 条,实际删除 ${result.deleted} 条`); + if (!result || result.ok === false) { + alert('批量删除失败:' + ((result as any)?.error || '未知错误')); + return; + } + alert(`批量删除完成:共提交 ${result.total ?? 0} 条,实际删除 ${result.deleted ?? 0} 条`); clearSelection(); load(); } catch (e) { - alert(errMsg(e)); + alert('批量删除失败:' + errMsg(e)); } }; diff --git a/server/src/routes/users.ts b/server/src/routes/users.ts index 5a87430..87c344f 100644 --- a/server/src/routes/users.ts +++ b/server/src/routes/users.ts @@ -237,9 +237,13 @@ router.post('/batch', authMiddleware, (req: AuthRequest, res: Response) => { }); router.delete('/batch', authMiddleware, (req: AuthRequest, res: Response) => { - const { ids } = req.body || {}; + const ids = Array.isArray((req.body || {}).ids) + ? (req.body as any).ids + : Array.isArray((req.query || {}).ids) + ? [].concat((req.query as any).ids as any) + : null; if (!Array.isArray(ids) || ids.length === 0) { - return res.status(400).json({ error: '请选择要删除的部员' }); + return res.status(400).json({ ok: false, error: '请选择要删除的部员' }); } const db = getDb(); const list: number[] = []; @@ -248,7 +252,7 @@ router.delete('/batch', authMiddleware, (req: AuthRequest, res: Response) => { if (!isNaN(n) && n > 0 && !list.includes(n)) list.push(n); } if (list.length === 0) { - return res.status(400).json({ error: '请选择有效的部员' }); + return res.status(400).json({ ok: false, error: '请选择有效的部员' }); } try { db.execCompat('BEGIN'); @@ -263,7 +267,38 @@ router.delete('/batch', authMiddleware, (req: AuthRequest, res: Response) => { res.json({ ok: true, deleted: count, total: list.length }); } catch (e: any) { try { db.execCompat('ROLLBACK'); } catch {} - res.status(500).json({ error: e?.message || '批量删除失败' }); + res.status(500).json({ ok: false, error: e?.message || '批量删除失败' }); + } +}); + +router.post('/batch-remove', authMiddleware, (req: AuthRequest, res: Response) => { + const { ids } = req.body || {}; + if (!Array.isArray(ids) || ids.length === 0) { + return res.status(400).json({ ok: false, error: '请选择要删除的部员' }); + } + const db = getDb(); + const list: number[] = []; + for (const id of ids) { + const n = Number(id); + if (!isNaN(n) && n > 0 && !list.includes(n)) list.push(n); + } + if (list.length === 0) { + return res.status(400).json({ ok: false, error: '请选择有效的部员' }); + } + try { + db.execCompat('BEGIN'); + const del = db.prepareCompat('DELETE FROM users WHERE id = ?'); + let count = 0; + for (const id of list) { + const r = del.run(id); + count += (r?.changes ?? 0); + } + db.execCompat('COMMIT'); + db.save(); + res.json({ ok: true, deleted: count, total: list.length }); + } catch (e: any) { + try { db.execCompat('ROLLBACK'); } catch {} + res.status(500).json({ ok: false, error: e?.message || '批量删除失败' }); } });