admin_new P0+P1 全批次合并 (84 commits) #2

Merged
direv merged 85 commits from develop into main 2026-08-07 11:27:17 +08:00
Showing only changes of commit a36dda7ccc - Show all commits

View File

@ -108,19 +108,30 @@ function resetForm() {
/**
* 加载企业下拉选项 (弹窗打开时拉一次, 后续复用)
* 后端: GET /enterprise/list 返 EnterpriseFeignDTO 列表 [{id, enterpriseName, ...}]
* 兜底: 后端失败时给空数组, UI 仍可用 (只是下拉是空的)
*
* 实现: 从 /user/user/page 用户列表聚合 (enterpriseId, enterpriseName) 去重
* 原因: gateway.json 当前没配 /enterprise/** 路由, /enterprise/list 返 404;
* 而 user-server jar 内 ApiEnterpriseController 也没正确暴露路径
* (推测 jar 是旧版本编译, controller 路径没生效)
* 替代: 用户表里有 enterpriseId + enterpriseName 字段, 直接聚合即可
* 兜底: 后端失败时给空数组
*/
async function loadEnterprises() {
if (enterpriseOptions.value.length > 0) return
enterpriseLoading.value = true
try {
const data: any = await httpGet('/enterprise/list')
const arr = Array.isArray(data) ? data : (data?.list || [])
enterpriseOptions.value = arr.map((it: any) => ({
id: Number(it.id ?? it.enterpriseId ?? 0),
name: it.enterpriseName || it.name || `企业 #${it.id}`
})).filter((it: EnterpriseOpt) => it.id > 0)
const data: any = await httpGet('/user/user/page', { page: 1, limit: 10000 })
const arr = Array.isArray(data?.list) ? data.list : (Array.isArray(data) ? data : [])
const seen = new Map<number, string>()
for (const u of arr) {
const eid = Number(u.enterpriseId ?? 0)
if (eid > 0 && !seen.has(eid)) {
seen.set(eid, u.enterpriseName || `企业 #${eid}`)
}
}
enterpriseOptions.value = Array.from(seen.entries())
.map(([id, name]) => ({ id, name }))
.sort((a, b) => a.id - b.id)
} catch {
enterpriseOptions.value = []
} finally {