feat: 版本推送默认展示全部项目版本; 公告列表显示关联项目

This commit is contained in:
root committed 2026-10-11 13:57:01 +08:00
1 parent c4b00cbf85
commit 5b73d0921d
6 files changed
+71 -20

No files matched your search

@@ -29,27 +29,33 @@ class AnnouncementController extends Controller
$params = [];
if ($keyword !== '') {
$where .= ' AND (title LIKE ? OR content LIKE ?)';
$where .= ' AND (a.title LIKE ? OR a.content LIKE ?)';
$params[] = "%{$keyword}%";
$params[] = "%{$keyword}%";
}
if ($type !== '' && in_array($type, ['system', 'update', 'promo', 'notice'], true)) {
$where .= ' AND type = ?';
$where .= ' AND a.type = ?';
$params[] = $type;
}
if ($target !== '' && in_array($target, ['all', 'admin', 'agent', 'client'], true)) {
$where .= ' AND target = ?';
$where .= ' AND a.target = ?';
$params[] = $target;
}
if ($status !== '') {
$where .= ' AND status = ?';
$where .= ' AND a.status = ?';
$params[] = (int) $status;
}
$total = (int) $db->fetchColumn("SELECT COUNT(*) FROM {$db->table('announcements')} {$where}", $params);
$total = (int) $db->fetchColumn(
"SELECT COUNT(*) FROM {$db->table('announcements')} a {$where}",
$params
);
$list = $db->fetchAll(
"SELECT * FROM {$db->table('announcements')} {$where}
ORDER BY is_top DESC, id DESC
"SELECT a.*, p.name AS project_name
FROM {$db->table('announcements')} a
LEFT JOIN {$db->table('projects')} p ON p.id = a.project_id
{$where}
ORDER BY a.is_top DESC, a.id DESC
LIMIT {$offset}, {$pageSize}",
$params
);