v1.0.30: companies 表删除 name_en(英文名称)字段及全部关联 - 迁移SQL+helpers白名单+add/import/export/list+person关联查询(companies/company_options/products)+completeness核心层与标签+company.js搜索/筛选/列表/详情
This commit is contained in:
@@ -45,7 +45,7 @@ $offset = ($page - 1) * $limit;
|
||||
$stmt = $pdo->prepare(
|
||||
"SELECT pwe.id AS work_id, pwe.company_id,
|
||||
CASE WHEN c.name_zh IS NOT NULL AND c.name_zh <> '' THEN c.name_zh
|
||||
ELSE COALESCE(c.name_en, c.display_name) END AS company_name,
|
||||
ELSE c.display_name END AS company_name,
|
||||
c.industry, pwe.department, pwe.position, pwe.job_level,
|
||||
pwe.start_date, pwe.end_date, pwe.is_current
|
||||
FROM person_work_experiences pwe
|
||||
|
||||
@@ -18,13 +18,13 @@ $pdo = DB::getInstance()->getPdo();
|
||||
$where = 'is_active = 1';
|
||||
$params = [];
|
||||
if ($keyword !== '') {
|
||||
$where .= ' AND (name_zh LIKE ? OR name_en LIKE ? OR display_name LIKE ?)';
|
||||
$where .= ' AND (name_zh LIKE ? OR display_name LIKE ?)';
|
||||
$like = "%$keyword%";
|
||||
array_push($params, $like, $like, $like);
|
||||
}
|
||||
|
||||
$stmt = $pdo->prepare(
|
||||
"SELECT id, COALESCE(NULLIF(display_name,''), name_zh, name_en) AS name
|
||||
"SELECT id, COALESCE(NULLIF(display_name,''), name_zh) AS name
|
||||
FROM companies WHERE $where ORDER BY id ASC LIMIT $limit"
|
||||
);
|
||||
$stmt->execute($params);
|
||||
|
||||
@@ -38,7 +38,7 @@ $offset = ($page - 1) * $limit;
|
||||
$stmt = $pdo->prepare(
|
||||
"SELECT DISTINCT cp.id, cp.category_name, cp.category_description, cp.is_core, cp.is_active,
|
||||
CASE WHEN c.name_zh IS NOT NULL AND c.name_zh <> '' THEN c.name_zh
|
||||
ELSE COALESCE(c.name_en, c.display_name) END AS company_name
|
||||
ELSE c.display_name END AS company_name
|
||||
$join
|
||||
ORDER BY company_name, cp.id DESC
|
||||
LIMIT $limit OFFSET $offset"
|
||||
|
||||
Reference in New Issue
Block a user