weaver-e10-builder 1.2.5 → 1.5.2

package/dist/commands/org.js

@@ -0,0 +1,402 @@
+import { copyFileSync, existsSync, readFileSync, writeFileSync } from 'node:fs';
+import { extname } from 'node:path';
+import { fileURLToPath } from 'node:url';
+import { AuthSession } from '../core/auth.js';
+import { ApiClient } from '../core/client.js';
+import { buildDeleteDepartmentPayload, buildSaveFormDataPayload, buildSaveFormPayload, buildUpdateDepartmentPayload, extractOrgFormTemplate, extractRecordId, fetchCurrentUser, getOrgDetailPath, resolveCurrentUserSubCompany, } from '../services/org-department.js';
+import { buildGetExcelDataPath, buildImportExcelDataPath, buildPreUploadForm, buildUploadFileIdPayload, buildUploadForm, downloadErrorFile, extractFileId, extractImportParam, extractPreUploadId, extractPreview, extractTaskId, fetchTaskResult, isTaskSettled, parseErrorFileReasons, readFileMeta, resolveUploadSet, waitTaskResult, } from '../services/org-employee.js';
+/**
+ * 组织架构（HRM）：部门。
+ *
+ * 新建是四步链（模板 → 布局 → 数据 → 组织树），细节见 `services/org-department.ts` 文件头。
+ * 每一步都**回读确认**再往下走 —— 链太长，中途静默失败会留下半拉子部门（组织树里没有、
+ * 但表单数据已经落了），比直接报错难查得多。
+ */
+export function registerOrgCommands(program) {
+    const org = program.command('org').description('组织架构（部门 / 岗位等）');
+    const dept = org.command('department').description('部门管理');
+    dept.command('create')
+        .description('新建部门')
+        .argument('<name>', '部门名称')
+        .option('--code <code>', '部门编号')
+        .option('--parent <id>', '父部门 id（顶层部门不传，默认挂在当前机构下）')
+        .option('--subcompany <id>', '所属机构 id（不传则自动解析当前用户的机构）')
+        .action(async (name, cmdOpts) => {
+        const opts = program.opts();
+        const auth = await AuthSession.fromOptions(opts);
+        if (!auth)
+            process.exit(1);
+        const client = new ApiClient(auth);
+        const baseUrl = auth.getBaseUrl();
+        const subcompanyId = cmdOpts.subcompany
+            || await resolveCurrentUserSubCompany(baseUrl, auth.eteamsId);
+        if (!subcompanyId) {
+            console.error('无法解析所属机构：当前用户没有机构上下文，请用 --subcompany <机构id> 显式指定');
+            process.exit(1);
+        }
+        // getForm 的 parentId：顶层部门传机构 id，子部门传父部门 id
+        const parentId = cmdOpts.parent || subcompanyId;
+        try {
+            // ① 模板（含现生成的 targetId）
+            const formRes = await client.get(`${baseUrl}/api/bs/hrm/organization/getForm?parentId=${encodeURIComponent(parentId)}&flag=department&virtualId=1&isMobile=false`, { ebbusinessid: subcompanyId });
+            const tpl = extractOrgFormTemplate(formRes);
+            // ② 布局 id（保存数据那步要用）
+            const layoutRes = await client.post(`${baseUrl}/api/hrm/form/core/getFormLayout`, {
+                terminalType: 'PC', formId: tpl.formId, module: 'hrm', newLayout: true,
+                dataCrossLayout: false, initialDatas: [], needPermission: true, cost: false, orgAsyncPageQuery: true,
+            });
+            const formLayoutId = String(layoutRes?.data?.formLayout?.id ?? '');
+            const multipleLayoutId = String(layoutRes?.data?.formLayoutMultiple?.id ?? '');
+            if (!formLayoutId || !multipleLayoutId) {
+                throw new Error('getFormLayout 未返回布局 id（formLayout / formLayoutMultiple）');
+            }
+            // ③ 落表单数据 → recordId
+            const dataRes = await client.post(`${baseUrl}/api/hrm/form/core/saveFormData?formId=${encodeURIComponent(tpl.formId)}`, buildSaveFormDataPayload(tpl, formLayoutId, multipleLayoutId));
+            if (dataRes?.code !== 200 || !dataRes?.status) {
+                throw new Error(`落表单数据失败: ${dataRes?.msg || '未知错误'}`);
+            }
+            const recordId = extractRecordId(dataRes);
+            // ④ 落组织树
+            const payload = buildSaveFormPayload(tpl, {
+                name, code: cmdOpts.code, parentId, recordId,
+            });
+            const saveRes = await client.post(`${baseUrl}/api/bs/hrm/organization/saveForm`, payload);
+            if (saveRes?.code !== 200 || !saveRes?.status) {
+                throw new Error(`保存部门失败: ${saveRes?.msg || '未知错误'}`);
+            }
+            const deptId = tpl.targetId;
+            if (opts.json) {
+                console.log(JSON.stringify({ success: true, id: deptId, name, parent: parentId, subcompany: subcompanyId, recordId }));
+            }
+            else {
+                console.log(`部门已创建: ${name}`);
+                console.log(`  id         ${deptId}`);
+                console.log(`  父级       ${parentId === subcompanyId ? `机构 ${subcompanyId}` : parentId}`);
+            }
+        }
+        catch (e) {
+            console.error(`  ❌ ${e?.message || e}`);
+            process.exit(1);
+        }
+    });
+    dept.command('edit')
+        .description('编辑部门（改名 / 改编号 / 移动父级 / 改排序）')
+        .argument('<id>', '部门 id')
+        .option('--name <name>', '新的部门名称')
+        .option('--code <code>', '新的部门编号')
+        .option('--parent <id>', '移动到该父部门下')
+        .option('--disporder <n>', '排序号')
+        .action(async (id, cmdOpts) => {
+        const opts = program.opts();
+        const auth = await AuthSession.fromOptions(opts);
+        if (!auth)
+            process.exit(1);
+        const client = new ApiClient(auth);
+        const baseUrl = auth.getBaseUrl();
+        const disporder = cmdOpts.disporder === undefined ? undefined : Number(cmdOpts.disporder);
+        if (disporder !== undefined && !Number.isFinite(disporder)) {
+            console.error('--disporder 必须是数字');
+            process.exit(1);
+        }
+        if (!cmdOpts.name && !cmdOpts.code && !cmdOpts.parent && disporder === undefined) {
+            console.error('没有要改的内容：至少给一个 --name / --code / --parent / --disporder');
+            process.exit(1);
+        }
+        try {
+            // ① 先读现状 —— 编辑报文是「完整现状 + 改动」，不是只发改动，key 全得带上
+            const detail = await client.get(`${baseUrl}${getOrgDetailPath(id)}`);
+            const payload = buildUpdateDepartmentPayload(detail, {
+                name: cmdOpts.name,
+                code: cmdOpts.code,
+                parentId: cmdOpts.parent,
+                disporder,
+            });
+            // ② 落组织树（与新建同一个端点）
+            const res = await client.post(`${baseUrl}/api/bs/hrm/organization/saveForm`, payload);
+            if (res?.code !== 200 || !res?.status) {
+                throw new Error(`保存失败: ${res?.msg || '未知错误'}`);
+            }
+            // ③ 回读确认 —— 编辑是静默失败高发区，接口回 200 不等于改上了
+            const after = await client.get(`${baseUrl}${getOrgDetailPath(id)}`);
+            const d = after?.data?.data ?? after?.data ?? {};
+            const actualName = String(d.name ?? '');
+            if (cmdOpts.name && actualName !== cmdOpts.name) {
+                throw new Error(`改名未生效：期望「${cmdOpts.name}」，回读仍是「${actualName}」`);
+            }
+            if (opts.json) {
+                console.log(JSON.stringify({ success: true, id, name: actualName, parent: payload.parent }));
+            }
+            else {
+                console.log(`部门已更新: ${actualName}`);
+                console.log(`  id         ${id}`);
+                console.log(`  父级       ${payload.parent}`);
+            }
+        }
+        catch (e) {
+            console.error(`  ❌ ${e?.message || e}`);
+            process.exit(1);
+        }
+    });
+    dept.command('delete')
+        .description('删除部门')
+        .argument('<id>', '部门 id')
+        .option('--parent <id>', '父部门 id（顶层部门的父是机构 id；不传则按当前机构解析）')
+        .option('--subcompany <id>', '所属机构 id（配合 --parent 缺省时使用）')
+        .action(async (id, cmdOpts) => {
+        const opts = program.opts();
+        const auth = await AuthSession.fromOptions(opts);
+        if (!auth)
+            process.exit(1);
+        const client = new ApiClient(auth);
+        const baseUrl = auth.getBaseUrl();
+        const parent = cmdOpts.parent
+            || cmdOpts.subcompany
+            || await resolveCurrentUserSubCompany(baseUrl, auth.eteamsId);
+        if (!parent) {
+            console.error('无法确定父级：请用 --parent <父部门id> 或 --subcompany <机构id> 指定');
+            process.exit(1);
+        }
+        const res = await client.post(`${baseUrl}/api/bs/hrm/department/delete`, buildDeleteDepartmentPayload(id, parent));
+        if (res?.code !== 200 || !res?.status) {
+            console.error(`删除失败: ${res?.msg || '未知错误'}`);
+            process.exit(1);
+        }
+        if (opts.json)
+            console.log(JSON.stringify({ success: true, id, parent }));
+        else
+            console.log(`部门已删除: ${id}`);
+    });
+    const emp = org.command('employee').description('人员管理');
+    emp.command('template')
+        .description('导出人员导入模板（xlsx，直接填好就能导）')
+        .option('--out <path>', '输出路径', '人员导入模板.xlsx')
+        .action((cmdOpts) => {
+        // 模板是**随包发的资源**：它带富文本表头（必填标红）和第二个「注意事项」工作表，
+        // 用代码重建很难做到逐字一样 —— 直接复制原文件，保真。
+        const tpl = fileURLToPath(new URL('../../assets/org-employee-template.xlsx', import.meta.url));
+        try {
+            copyFileSync(tpl, cmdOpts.out);
+            console.log(`模板已导出: ${cmdOpts.out}`);
+            console.log('  填好第 1 个工作表（表头别改字），再用 org employee import 导入');
+        }
+        catch (e) {
+            console.error(`  ❌ 导出失败: ${e?.message || e}`);
+            process.exit(1);
+        }
+    });
+    emp.command('import')
+        .description('从 Excel 批量导入人员（建议先 --dry-run 预览）')
+        .argument('<file>', 'xlsx 文件路径')
+        .option('--dry-run', '只预览不导入 —— 走到预览就停，不往组织里写任何东西')
+        .option('--mode <add|update>', '新增（add）或更新（update）', 'add')
+        .option('--find-by <field>', '更新时按哪个字段认人', 'username')
+        .option('--review <n>', '预览行数（平台上限）', '100')
+        .option('--no-wait', '提交后立刻返回，不等导入结果（⚠ 不等就等于不校验，提交成功≠导入成功）')
+        .option('--wait-timeout <ms>', '等待结果的超时毫秒数', '60000')
+        .option('--error-file <path>', '失败数据的保存路径（默认与源文件同目录、同名 + .错误数据.xlsx）')
+        .option('--no-error-file', '有失败数据时也不下载')
+        .action(async (file, cmdOpts) => {
+        const opts = program.opts();
+        const auth = await AuthSession.fromOptions(opts);
+        if (!auth)
+            process.exit(1);
+        const client = new ApiClient(auth);
+        const baseUrl = auth.getBaseUrl();
+        if (!existsSync(file)) {
+            console.error(`文件不存在: ${file}`);
+            process.exit(1);
+        }
+        try {
+            // ⓪ 导入参数：bizId 与那一串 module/function/handler/service/dataType 全由平台现给
+            const param = extractImportParam(await client.post(`${baseUrl}/api/bs/hrm/emp/edit/importParam`, {}));
+            const employeeId = String((await fetchCurrentUser(baseUrl, auth.eteamsId))?.id ?? '');
+            if (!employeeId)
+                throw new Error('拿不到当前用户 id（上传报文的 customParam.employeeId 要用）');
+            const meta = readFileMeta(file);
+            const bytes = readFileSync(file);
+            // ① 预上传 → ② 上传（两步的字段几乎一样，② 多 preUploadId 与 uploadType）
+            const preUploadId = extractPreUploadId(await client.postMultipart(`${baseUrl}/api/file/preUploadCheck`, buildPreUploadForm(meta, employeeId, bytes)));
+            const fileId = extractFileId(await client.postMultipart(`${baseUrl}/api/file/module/upload`, buildUploadForm(meta, employeeId, preUploadId, bytes)));
+            // ③ 文件加密校验（走个过场，平台会回「文件未加密」）
+            const pwd = await client.post(`${baseUrl}/api/ebatch/checkFilePassword`, { fileId });
+            if (pwd?.data?.data?.status === false) {
+                throw new Error(`文件校验未通过: ${pwd?.data?.data?.msg || '未知原因'}`);
+            }
+            // ④ 建导入任务 → taskId
+            const set = resolveUploadSet({
+                importType: cmdOpts.mode,
+                empFindField: cmdOpts.findBy,
+                fileType: extname(file).replace(/^\./, '') || 'xlsx',
+            });
+            const taskId = extractTaskId(await client.post(`${baseUrl}/api/ebatch/uploadFileId`, buildUploadFileIdPayload(param, fileId, set, Date.now())));
+            // ⑤ 预览 —— 到这一步为止**什么都没落库**
+            const reviewNum = Number(cmdOpts.review) || 100;
+            const preview = extractPreview(await client.post(`${baseUrl}${buildGetExcelDataPath(param, taskId, reviewNum)}`));
+            if (opts.json) {
+                console.log(JSON.stringify({
+                    success: true, dryRun: Boolean(cmdOpts.dryRun), taskId,
+                    mode: set.importType, file: meta.name, ...preview,
+                }));
+            }
+            else {
+                console.log(`文件      ${meta.name}（${meta.size} 字节）`);
+                console.log(`工作表    ${preview.sheetNames.join(' / ') || '-'}`);
+                console.log(`列        ${preview.columns.length} 列`);
+                console.log(`模式      ${set.importType === 'update' ? `更新（按 ${set.empFindField} 认人）` : '新增'}`);
+                console.log(`预览      ${preview.rows.length} 行${preview.rows.length >= reviewNum ? `（已达上限 ${reviewNum}，实际可能更多）` : ''}`);
+                console.log('');
+                for (const [i, row] of preview.rows.entries()) {
+                    const pairs = Object.entries(row)
+                        .filter(([, v]) => v !== '' && v !== null && v !== undefined)
+                        .slice(0, 6)
+                        .map(([k, v]) => `${k}=${v}`);
+                    console.log(`  ${String(i + 1).padStart(3)}. ${pairs.join('  ')}`);
+                }
+            }
+            if (cmdOpts.dryRun) {
+                if (!opts.json)
+                    console.log('\n以上仅为预览，**未导入任何数据**（--dry-run）。去掉 --dry-run 才会真正执行。');
+                return;
+            }
+            // ⑥ 真正导入 —— ⚠ 它的响应体只有一个 `true`，**结果不在这里**
+            const runRes = await client.post(`${baseUrl}${buildImportExcelDataPath(param, taskId)}`);
+            if (runRes?.code !== 200 || runRes?.status === false) {
+                throw new Error(`导入失败: ${runRes?.msg || '未知错误'}`);
+            }
+            if (cmdOpts.wait === false) {
+                if (opts.json)
+                    console.log(JSON.stringify({ success: true, submitted: true, waited: false, taskId, file: meta.name }));
+                else {
+                    console.log(`\n导入已提交: ${meta.name}`);
+                    console.log(`  taskId     ${taskId}`);
+                    console.log(`  ⚠ --no-wait：没有等结果，**这不代表导入成功**。稍后查: e10-cli org employee task ${taskId}`);
+                }
+                return;
+            }
+            // ⑦ 等结果 —— 不等就等于把「整批失败」也报成成功
+            const result = await waitTaskResult(client, baseUrl, taskId, { timeoutMs: Number(cmdOpts.waitTimeout) || 60_000 });
+            if (!result) {
+                // 超时不编一个成功出来
+                console.log(`\n导入仍在处理中（已等 ${Number(cmdOpts.waitTimeout) || 60_000} ms 未到终态）。`);
+                console.log(`  taskId     ${taskId}`);
+                console.log(`  稍后查: e10-cli org employee task ${taskId}`);
+                process.exitCode = 1;
+                return;
+            }
+            const failed = result.errorCount > 0 || result.status === -1;
+            let savedTo = '';
+            // 失败原因挂在出错单元格的批注上，不在任何一列里 —— 所以先下到内存解析，再看要不要落盘
+            const reasons = [];
+            if (failed && result.errorFileId) {
+                try {
+                    const dl = await downloadErrorFile(baseUrl, result.errorFileId, auth.eteamsId);
+                    reasons.push(...parseErrorFileReasons(dl.bytes));
+                    if (cmdOpts.errorFile !== false) {
+                        const dest = typeof cmdOpts.errorFile === 'string' && cmdOpts.errorFile
+                            ? cmdOpts.errorFile
+                            : `${file.replace(/\.[^.\\/]+$/, '')}.错误数据.xlsx`;
+                        writeFileSync(dest, dl.bytes);
+                        savedTo = dest;
+                    }
+                }
+                catch (e) {
+                    // 下载失败不影响「导入失败」这个结论，如实报出来即可
+                    console.error(`  ⚠ 失败数据下载失败: ${e.message}`);
+                }
+            }
+            if (opts.json) {
+                console.log(JSON.stringify({
+                    success: !failed, taskId, file: meta.name,
+                    status: result.status, message: result.msg,
+                    successCount: result.successCount, errorCount: result.errorCount,
+                    errorFileId: result.errorFileId || undefined, errorFile: savedTo || undefined,
+                    reasons: reasons.length ? reasons : undefined,
+                }));
+            }
+            else {
+                console.log(`\n导入结果: ${meta.name}`);
+                console.log(`  taskId     ${taskId}`);
+                if (result.countsUnknown) {
+                    console.log(`  ⚠ 平台未回条数（callbackData 解析不出），以平台侧为准`);
+                }
+                else {
+                    console.log(`  已导入     ${result.successCount} 条`);
+                    console.log(`  失败       ${result.errorCount} 条`);
+                }
+                if (result.msg)
+                    console.log(`  平台说明   ${result.msg}`);
+                // 原因在批注里：不打出来的话，光看导出文件是看不出为什么失败的
+                if (reasons.length) {
+                    console.log(`  失败原因`);
+                    for (const r of reasons)
+                        console.log(`    第 ${r.row} 行 · ${r.header}${r.value ? `（${r.value}）` : ''}: ${r.reason}`);
+                }
+                if (failed && result.errorFileId)
+                    console.log(`  失败数据   ${result.errorFileId}${savedTo ? ` → ${savedTo}` : ''}`);
+            }
+            // 有失败行就退出码非 0 —— 脚本据此判断，别让调用方以为成功了
+            if (failed)
+                process.exitCode = 1;
+        }
+        catch (e) {
+            console.error(`  ❌ ${e?.message || e}`);
+            process.exit(1);
+        }
+    });
+    emp.command('task')
+        .description('查人员导入任务的结果（导入时没等、或超时了，用这个补看）')
+        .argument('<taskId>', '导入任务的 taskId（import 输出里的那个）')
+        .option('--error-file <path>', '有失败数据时保存到此路径')
+        .action(async (taskId, cmdOpts) => {
+        const opts = program.opts();
+        const auth = await AuthSession.fromOptions(opts);
+        if (!auth)
+            process.exit(1);
+        const client = new ApiClient(auth);
+        const baseUrl = auth.getBaseUrl();
+        try {
+            const r = await fetchTaskResult(client, baseUrl, taskId);
+            const failed = r.errorCount > 0 || r.status === -1;
+            let savedTo = '';
+            const reasons = [];
+            if (failed && r.errorFileId) {
+                const dl = await downloadErrorFile(baseUrl, r.errorFileId, auth.eteamsId);
+                reasons.push(...parseErrorFileReasons(dl.bytes));
+                if (cmdOpts.errorFile) {
+                    writeFileSync(cmdOpts.errorFile, dl.bytes);
+                    savedTo = cmdOpts.errorFile;
+                }
+            }
+            if (opts.json) {
+                console.log(JSON.stringify({ taskId, ...r, errorFile: savedTo || undefined, reasons: reasons.length ? reasons : undefined }));
+                return;
+            }
+            console.log(`任务 ${taskId}`);
+            console.log(`  状态       ${r.status}${r.status === 0 ? '（成功）' : r.status === -1 ? '（有错误数据）' : '（未到终态）'}`);
+            if (r.countsUnknown)
+                console.log('  ⚠ 平台未回条数（callbackData 解析不出）');
+            else {
+                console.log(`  已导入     ${r.successCount} 条`);
+                console.log(`  失败       ${r.errorCount} 条`);
+            }
+            if (r.msg)
+                console.log(`  平台说明   ${r.msg}`);
+            if (reasons.length) {
+                console.log(`  失败原因`);
+                for (const x of reasons)
+                    console.log(`    第 ${x.row} 行 · ${x.header}${x.value ? `（${x.value}）` : ''}: ${x.reason}`);
+            }
+            if (r.errorFileId) {
+                console.log(`  失败数据   ${r.errorFileId}${savedTo ? ` → ${savedTo}` : '（加 --error-file <路径> 可保存）'}`);
+            }
+            // 没到终态、或到终态但有失败行 —— 两种都不是「成功」，退出码非 0
+            if (!isTaskSettled(r) || failed)
+                process.exitCode = 1;
+        }
+        catch (e) {
+            console.error(`  ❌ ${e?.message || e}`);
+            process.exit(1);
+        }
+    });
+}
+//# sourceMappingURL=org.js.map

package/dist/commands/org.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"org.js","sourceRoot":"","sources":["../../src/commands/org.ts"],"names":[],"mappings":"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"}

package/dist/commands/role.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"role.d.ts","sourceRoot":"","sources":["../../src/commands/role.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAsCpC,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAsN3D"}
+{"version":3,"file":"role.d.ts","sourceRoot":"","sources":["../../src/commands/role.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AA0CpC,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAoQ3D"}

package/dist/commands/role.js

@@ -1,5 +1,6 @@
 import { AuthSession } from '../core/auth.js';
 import { ApiClient } from '../core/client.js';
+import { buildMemberEntry, buildMemberSavePayload, buildMemberListBody, extractMemberRows, isMemberKind, pickExact, MEMBER_KINDS, MEMBER_KIND_LABEL, } from '../services/role-member.js';
 function flattenTree(nodes, depth = 0) {
     const result = [];
     for (const node of nodes) {
@@ -144,81 +145,124 @@ export function registerRoleCommands(program) {
             process.exit(1);
         }
     });
+    /** 人员：逐个关键词搜（精确同名优先，歧义报错）。 */
+    async function searchPeople(client, baseUrl, keywords) {
+        const out = [];
+        for (const kw of keywords) {
+            const res = await client.post(`${baseUrl}/api/hrm/common/getEmployeeByKeyWords`, {
+                keyword: kw, searchType: 1, searchCount: 20, appDetachModule: 'EM',
+                disableAppDetach: 0, pageNo: 1, pageSize: 20,
+            });
+            if (res?.code !== 200)
+                throw new Error(`搜索人员「${kw}」失败: ${res?.msg || '未知错误'}`);
+            out.push(pickExact(res?.data?.userList || [], kw, '人员', (u) => u?.name));
+        }
+        return out;
+    }
+    /** 组织类成员（部门 / 分部 / 岗位 / 渠道）：走浏览接口按名称搜，与人员共用同一条保存链路。 */
+    async function searchOrgs(client, baseUrl, kind, keywords, roleId) {
+        const label = MEMBER_KIND_LABEL[kind];
+        const out = [];
+        for (const kw of keywords) {
+            const res = await client.post(`${baseUrl}/api/hrm/common/browser/data/${kind}`, {
+                browserMultiple: true, hideManager: 1, cmd: 'list', isRoleMaintainer: false,
+                roleId, current: 1, pageSize: 20,
+                formDatas: {
+                    name: [{ nameCondition: { id: 'in', content: '包含', disabled: false } }],
+                    subcompany: [{ subcompanyCondition: { id: 'eq', content: '等于', disabled: false } }],
+                    code: [{ codeCondition: { id: 'in', content: '包含', disabled: false } }],
+                    parent: [{ parentCondition: { id: 'eq', content: '等于', disabled: false } }],
+                },
+                type: 'and', stopDepartment: false, enableSubcompany: false,
+                browserTreeDefaultExpandedLevel: '1',
+                quickSearchDatas: { name: kw },
+            });
+            if (res?.code !== 200)
+                throw new Error(`搜索${label}「${kw}」失败: ${res?.msg || '未知错误'}`);
+            out.push(pickExact(res?.data?.data || [], kw, label, (o) => o?.name));
+        }
+        return out;
+    }
     role.command('add-member')
-        .description('添加成员到角色')
+        .description('添加成员到角色（人员 / 部门 / 分部；一次可给多个名字）')
         .argument('<roleId>', '角色 ID')
-        .argument('<keyword>', '人员搜索关键词')
-        .action(async (roleId, keyword) => {
+        .argument('<keywords...>', '对象名称（人员名 / 部门名 / 分部名），各自独立搜索')
+        .option('--type <kind>', `成员类型：${MEMBER_KINDS.join(' / ')}（资源=人员）`, 'resource')
+        .option('--sec-min <n>', '安全级别下限（**随租户配置变**，缺省 0）')
+        .option('--sec-max <n>', '安全级别上限（**随租户配置变**，缺省 100）')
+        .option('--is-seclevel', '启用安全级别校验（部分租户默认开启）')
+        .option('--department-attribute <list>', '仅部门/分部：归属属性逗号分隔，subordinate(含下属部门) / partTimeStaff(含兼职人员)')
+        .action(async (roleId, keywords, cmdOpts) => {
         const opts = program.opts();
         const auth = await AuthSession.fromOptions(opts);
         if (!auth)
             process.exit(1);
         const client = new ApiClient(auth);
         const baseUrl = auth.getBaseUrl();
-        // Search for user
-        const userData = await client.post(`${baseUrl}/api/hrm/common/getEmployeeByKeyWords`, {
-            keyword,
-            searchType: 1,
-            searchCount: 1,
-            appDetachModule: 'EM',
-            disableAppDetach: 0,
-            pageNo: 1,
-            pageSize: 1,
-        });
-        if (userData?.code !== 200 || !userData?.data?.userList?.length) {
-            console.error(`未找到人员: ${keyword}`);
+        if (!isMemberKind(cmdOpts.type)) {
+            console.error(`--type 只支持 ${MEMBER_KINDS.join(' / ')}，收到: ${cmdOpts.type}`);
             process.exit(1);
         }
-        const emp = userData.data.userList[0];
-        const payload = {
-            objType: 'resource',
-            obj_level: '1',
-            seclevel: { max: 100, min: 0 },
-            org_permission: 'ALL_SCOPE',
-            position_level: '1',
-            isOpenSubcompany: false,
-            isSeclevel: false,
-            includeFlag: false,
-            isAll: false,
-            appDetach: false,
-            objectTypeFilter: ['resource', 'department', 'channel', 'position', 'all', 'external', 'allExternal'],
-            isRoleMaintainer: false,
-            expireType: 'UNLIMITED',
-            detach: true,
-            obj_resource: [{
-                    id: emp.id || '',
-                    cid: emp.cid || emp.companyId || '',
-                    userid: emp.userid || emp.userId || emp.id || '',
-                    name: emp.name || '',
-                    statusCode: emp.statusCode || 'normal',
-                    content: emp.name || '',
-                    title: `${emp.name || ''}|${emp.department || ''}`,
-                    contentDesc: emp.name || '',
-                    department: emp.department || '',
-                    avatar: emp.avatar || { previewPath: '', appPreviewPath: '', name: emp.name || '', userId: emp.id || '' },
-                    indexType: 'R',
-                    isLeaf: true,
-                    templateType: 'default',
-                    originTargetType: 'user',
-                    pid: '',
-                    richContent: emp.name || '',
-                    departmentId: emp.departmentId || emp.departmentid || '',
-                    mainId: emp.mainId || emp.id || '',
-                    stopDepartment: false,
-                    leaf: true,
-                }],
-        };
-        const data = await client.post(`${baseUrl}/api/bs/auth/role/${roleId}/member/save-or-update`, payload);
-        if (data?.code === 200 && data?.status) {
-            const msg = opts.json
-                ? JSON.stringify({ success: true, roleId, member: emp.name })
-                : `已添加成员: ${emp.name} (${emp.id}) → 角色 ${roleId}`;
-            console.log(msg);
+        const kind = cmdOpts.type;
+        try {
+            const raws = kind === 'resource'
+                ? await searchPeople(client, baseUrl, keywords)
+                : await searchOrgs(client, baseUrl, kind, keywords, roleId);
+            const entries = raws.map((r) => buildMemberEntry(kind, r));
+            const payload = buildMemberSavePayload(kind, entries, {
+                secMin: cmdOpts.secMin !== undefined ? Number(cmdOpts.secMin) : undefined,
+                secMax: cmdOpts.secMax !== undefined ? Number(cmdOpts.secMax) : undefined,
+                isSeclevel: cmdOpts.isSeclevel,
+                departmentAttribute: cmdOpts.departmentAttribute
+                    ? cmdOpts.departmentAttribute.split(',').map((s) => s.trim()).filter(Boolean)
+                    : undefined,
+            });
+            const data = await client.post(`${baseUrl}/api/bs/auth/role/${roleId}/member/save-or-update`, payload);
+            if (data?.code !== 200 || !data?.status)
+                throw new Error(`添加失败: ${data?.msg || '未知错误'}`);
+            if (opts.json) {
+                console.log(JSON.stringify({
+                    success: true, roleId, type: kind,
+                    members: entries.map((e) => ({ id: e.id, name: e.name })),
+                }));
+            }
+            else {
+                console.log(`已添加 ${entries.length} 个成员到角色 ${roleId}（${MEMBER_KIND_LABEL[kind]}）:`);
+                for (const e of entries)
+                    console.log(`  ${e.name}  (${e.id})`);
+            }
         }
-        else {
-            console.error(`添加失败: ${data?.msg || '未知错误'}`);
+        catch (e) {
+            console.error(`  ❌ ${e?.message || e}`);
             process.exit(1);
         }
     });
+    role.command('member-list')
+        .description('列出角色成员（人员 / 部门 / 分部）')
+        .argument('<roleId>', '角色 ID')
+        .action(async (roleId) => {
+        const opts = program.opts();
+        const auth = await AuthSession.fromOptions(opts);
+        if (!auth)
+            process.exit(1);
+        const client = new ApiClient(auth);
+        const baseUrl = auth.getBaseUrl();
+        const res = await client.post(`${baseUrl}/api/bs/auth/role/${roleId}/member/list`, buildMemberListBody());
+        if (res?.code !== 200 || !res?.status) {
+            console.error(`读取成员失败: ${res?.msg || '未知错误'}`);
+            process.exit(1);
+        }
+        const rows = extractMemberRows(res);
+        if (opts.json) {
+            console.log(JSON.stringify({ roleId, count: rows.length, members: rows }, null, 2));
+            return;
+        }
+        console.log(`角色 ${roleId} 共 ${rows.length} 个成员:`);
+        for (const r of rows) {
+            console.log(`  [${r.resourceType || '?'}] ${r.object}`
+                + `${r.memberLevel ? `  级别=${r.memberLevel}` : ''}`
+                + `${r.orgPermission ? `  范围=${r.orgPermission}` : ''}  userId=${r.userId}`);
+        }
+    });
 }
 //# sourceMappingURL=role.js.map