Compare commits
2 Commits
ef4ab774b0
...
41cddcd2c1
| Author | SHA1 | Date | |
|---|---|---|---|
| 41cddcd2c1 | |||
| 4d3a390075 |
@@ -80,5 +80,12 @@ export function queryTrackEvents(params?: {
|
||||
page?: number
|
||||
pageSize?: number
|
||||
}): Promise<{ list: TrackEvent[]; total: number; page: number; pageSize: number }> {
|
||||
return request({ url: '/logs/track/list', data: params })
|
||||
// 过滤掉 undefined 值
|
||||
const queryParams: Record<string, any> = {}
|
||||
if (params) {
|
||||
for (const [key, value] of Object.entries(params)) {
|
||||
if (value !== undefined) queryParams[key] = value
|
||||
}
|
||||
}
|
||||
return request({ url: '/logs/track/list', data: queryParams })
|
||||
}
|
||||
|
||||
@@ -52,14 +52,15 @@ router.get('/', requireAdmin, async (req, res) => {
|
||||
)
|
||||
const total = (countResult as any[])[0].total
|
||||
|
||||
// LIMIT/OFFSET 直接嵌入 SQL(execute 对参数类型要求严格)
|
||||
const [rows] = await pool.execute(
|
||||
`SELECT f.*, u.nickname, u.avatar_url
|
||||
FROM feedbacks f
|
||||
LEFT JOIN users u ON f.user_id = u.id
|
||||
WHERE ${where}
|
||||
ORDER BY f.created_at DESC
|
||||
LIMIT ? OFFSET ?`,
|
||||
[...params, pageSize, offset]
|
||||
LIMIT ${pageSize} OFFSET ${offset}`,
|
||||
params
|
||||
)
|
||||
|
||||
res.json({ code: 0, data: { list: rows, total, page, pageSize } })
|
||||
|
||||
Reference in New Issue
Block a user