@steedos-labs/content-compliance 0.8.26 → 0.8.27

package/lib/methods/__tests__/approvalReviewerTrigger.test.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/methods/__tests__/approvalReviewerTrigger.test.js

@@ -0,0 +1,389 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+var tslib_1 = require("tslib");
+var fs = require("fs");
+var path = require("path");
+var yaml = require("js-yaml");
+var lodash = require("lodash");
+var triggerPath = path.resolve(__dirname, '../../..', 'main/default/triggers/pepsico_material_approval_change.trigger.yml');
+var AsyncFunction = Object.getPrototypeOf(function () {
+    return tslib_1.__awaiter(this, void 0, void 0, function () { return tslib_1.__generator(this, function (_a) {
+        return [2];
+    }); });
+}).constructor;
+var loadHandler = function () {
+    var meta = yaml.safeLoad(fs.readFileSync(triggerPath, 'utf8'));
+    return new AsyncFunction('ctx', 'global', 'process', 'console', meta.handler);
+};
+var MATRIX_ROW = {
+    _id: 'matrix-1',
+    ns_reviewer: ['ns-u'],
+    ns_assistance: ['ns-a'],
+    legal_reviewer: ['legal-u'],
+    sra_reviewer: ['sra-u'],
+    ca_reviewer: ['ca-u'],
+    qc_reviewer: ['qc-u'],
+    can_pass_users: ['skip-u'],
+    pre_ns_reviewer: 'pre-ns-u',
+    reviewer: ['fixed-u']
+};
+var buildCtx = function (_a) {
+    var doc = _a.doc, _b = _a.previousDoc, previousDoc = _b === void 0 ? null : _b, _c = _a.isInsert, isInsert = _c === void 0 ? true : _c, _d = _a.matrixRows, matrixRows = _d === void 0 ? [] : _d;
+    var logsStub = { directInsert: jest.fn().mockResolvedValue({}) };
+    var reviewerStub = { directFind: jest.fn().mockResolvedValue(matrixRows) };
+    var fallback = { directFind: jest.fn().mockResolvedValue([]), directInsert: jest.fn().mockResolvedValue({}) };
+    var ctx = {
+        params: { doc: doc, previousDoc: previousDoc, isInsert: isInsert, userId: 'submitter-u', spaceId: 'space-1', id: doc._id },
+        getObject: jest.fn(function (name) {
+            if (name === 'pepsico_reviewer')
+                return reviewerStub;
+            if (name === 'logs')
+                return logsStub;
+            return fallback;
+        })
+    };
+    return { ctx: ctx, logsStub: logsStub, reviewerStub: reviewerStub };
+};
+var run = function (ctx, env) {
+    if (env === void 0) { env = {}; }
+    return loadHandler()(ctx, { _: lodash }, { env: env }, { error: jest.fn(), log: jest.fn() });
+};
+var baseDoc = function (overrides) {
+    if (overrides === void 0) { overrides = {}; }
+    return (tslib_1.__assign({ _id: 'approval-1', name: '2609095607', space: 'space-1', classification: 'MD-SC1-SC16', product: '16541517620103133', owner_department: 'org-1' }, overrides));
+};
+describe('pepsico_material_approval_change 保存时校验审核人 (#450)', function () {
+    it('新建时审核人全空 -> 按角色矩阵补齐, 放行', function () { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
+        var doc, _a, ctx, reviewerStub, filters;
+        return tslib_1.__generator(this, function (_b) {
+            switch (_b.label) {
+                case 0:
+                    doc = baseDoc({ approval_type: 'departmental_review' });
+                    _a = buildCtx({ doc: doc, matrixRows: [MATRIX_ROW] }), ctx = _a.ctx, reviewerStub = _a.reviewerStub;
+                    return [4, run(ctx)];
+                case 1:
+                    _b.sent();
+                    expect(doc).toMatchObject({
+                        ns_reviewer: ['ns-u'],
+                        legal_reviewer: ['legal-u'],
+                        sra_reviewer: ['sra-u'],
+                        ca_reviewer: ['ca-u'],
+                        ns_assistance: ['ns-a'],
+                        pre_ns_reviewer: 'pre-ns-u',
+                        can_pass_users: ['skip-u']
+                    });
+                    filters = reviewerStub.directFind.mock.calls[0][0].filters;
+                    expect(filters).toEqual(expect.arrayContaining([
+                        ['classification', '=', 'MD-SC1-SC16'],
+                        ['product', '=', '16541517620103133'],
+                        ['org', '=', 'org-1']
+                    ]));
+                    return [2];
+            }
+        });
+    }); });
+    it('approval_type 为空也要校验 —— 旧逻辑正是在这里整体跳过的', function () { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
+        var doc, ctx;
+        return tslib_1.__generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    doc = baseDoc();
+                    ctx = buildCtx({ doc: doc, matrixRows: [] }).ctx;
+                    return [4, expect(run(ctx)).rejects.toThrow(/缺少NS、Legal、SRA、CA审核人/)];
+                case 1:
+                    _a.sent();
+                    return [2];
+            }
+        });
+    }); });
+    it('approval_type 为空但四部门齐全 -> 放行', function () { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
+        var doc, ctx;
+        return tslib_1.__generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    doc = baseDoc({
+                        ns_reviewer: ['a'], legal_reviewer: ['b'], sra_reviewer: ['c'], ca_reviewer: ['d']
+                    });
+                    ctx = buildCtx({ doc: doc, matrixRows: [] }).ctx;
+                    return [4, expect(run(ctx)).resolves.toBeUndefined()];
+                case 1:
+                    _a.sent();
+                    return [2];
+            }
+        });
+    }); });
+    it('approval_type 为空但已有固定审核人 -> 放行(走固定人员分支)', function () { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
+        var doc, ctx;
+        return tslib_1.__generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    doc = baseDoc({ reviewer: ['fixed-u'] });
+                    ctx = buildCtx({ doc: doc, matrixRows: [] }).ctx;
+                    return [4, expect(run(ctx)).resolves.toBeUndefined()];
+                case 1:
+                    _a.sent();
+                    return [2];
+            }
+        });
+    }); });
+    it('草稿更新时只校验合并后的记录, 不碰审核人的编辑不会被误拦', function () { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
+        var doc, previousDoc, _a, ctx, reviewerStub;
+        return tslib_1.__generator(this, function (_b) {
+            switch (_b.label) {
+                case 0:
+                    doc = { remark: '改个备注' };
+                    previousDoc = baseDoc({
+                        current_step: 'draft',
+                        approval_type: 'departmental_review',
+                        ns_reviewer: ['a'], legal_reviewer: ['b'], sra_reviewer: ['c'], ca_reviewer: ['d']
+                    });
+                    _a = buildCtx({ doc: doc, previousDoc: previousDoc, isInsert: false, matrixRows: [MATRIX_ROW] }), ctx = _a.ctx, reviewerStub = _a.reviewerStub;
+                    return [4, expect(run(ctx)).resolves.toBeUndefined()];
+                case 1:
+                    _b.sent();
+                    expect(doc.ns_reviewer).toBeUndefined();
+                    expect(reviewerStub.directFind).toHaveBeenCalled();
+                    return [2];
+            }
+        });
+    }); });
+    it('草稿更新时把审核人清空 -> 拦下(旧逻辑 update 完全不校验)', function () { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
+        var doc, previousDoc, ctx;
+        return tslib_1.__generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    doc = { ns_reviewer: [], legal_reviewer: [], sra_reviewer: [], ca_reviewer: [] };
+                    previousDoc = baseDoc({
+                        current_step: 'draft',
+                        approval_type: 'departmental_review',
+                        ns_reviewer: ['a'], legal_reviewer: ['b'], sra_reviewer: ['c'], ca_reviewer: ['d']
+                    });
+                    ctx = buildCtx({ doc: doc, previousDoc: previousDoc, isInsert: false, matrixRows: [] }).ctx;
+                    return [4, expect(run(ctx)).rejects.toThrow(/缺少NS、Legal、SRA、CA审核人/)];
+                case 1:
+                    _a.sent();
+                    return [2];
+            }
+        });
+    }); });
+    it('只补空, 不覆盖已有值', function () { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
+        var doc, ctx;
+        return tslib_1.__generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    doc = baseDoc({ approval_type: 'departmental_review', ns_reviewer: ['manual-ns'] });
+                    ctx = buildCtx({ doc: doc, matrixRows: [MATRIX_ROW] }).ctx;
+                    return [4, run(ctx)];
+                case 1:
+                    _a.sent();
+                    expect(doc.ns_reviewer).toEqual(['manual-ns']);
+                    expect(doc.ca_reviewer).toEqual(['ca-u']);
+                    return [2];
+            }
+        });
+    }); });
+    it('矩阵命中但该格没配全 -> 指明缺哪几个部门', function () { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
+        var doc, ctx;
+        return tslib_1.__generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    doc = baseDoc({ approval_type: 'departmental_review' });
+                    ctx = buildCtx({ doc: doc, matrixRows: [{ _id: 'matrix-2', ns_reviewer: ['ns-u'] }] }).ctx;
+                    return [4, expect(run(ctx)).rejects.toThrow(/缺少Legal、SRA、CA审核人/)];
+                case 1:
+                    _a.sent();
+                    return [2];
+            }
+        });
+    }); });
+    it('ec_has_detail_page=yes 时 QC 也必填', function () { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
+        var doc, ctx;
+        return tslib_1.__generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    doc = baseDoc({ approval_type: 'departmental_review', ec_has_detail_page: 'yes' });
+                    ctx = buildCtx({ doc: doc, matrixRows: [tslib_1.__assign(tslib_1.__assign({}, MATRIX_ROW), { qc_reviewer: null })] }).ctx;
+                    return [4, expect(run(ctx)).rejects.toThrow(/缺少QC审核人/)];
+                case 1:
+                    _a.sent();
+                    return [2];
+            }
+        });
+    }); });
+    it('固定人员审核只要求 reviewer', function () { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
+        var doc, ctx;
+        return tslib_1.__generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    doc = baseDoc({ approval_type: 'personnel_review' });
+                    ctx = buildCtx({ doc: doc, matrixRows: [{ _id: 'matrix-3', reviewer: ['fixed-u'] }] }).ctx;
+                    return [4, run(ctx)];
+                case 1:
+                    _a.sent();
+                    expect(doc.reviewer).toEqual(['fixed-u']);
+                    return [2];
+            }
+        });
+    }); });
+    it('固定人员审核缺 reviewer -> 拦下', function () { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
+        var doc, ctx;
+        return tslib_1.__generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    doc = baseDoc({ approval_type: 'personnel_review' });
+                    ctx = buildCtx({ doc: doc, matrixRows: [] }).ctx;
+                    return [4, expect(run(ctx)).rejects.toThrow(/缺少固定审核人/)];
+                case 1:
+                    _a.sent();
+                    return [2];
+            }
+        });
+    }); });
+    it('DCO 分类跳过校验, 不查矩阵', function () { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
+        var doc, _a, ctx, reviewerStub;
+        return tslib_1.__generator(this, function (_b) {
+            switch (_b.label) {
+                case 0:
+                    doc = baseDoc({ classification: 'MD-PO1-PO18' });
+                    _a = buildCtx({ doc: doc, matrixRows: [] }), ctx = _a.ctx, reviewerStub = _a.reviewerStub;
+                    return [4, expect(run(ctx)).resolves.toBeUndefined()];
+                case 1:
+                    _b.sent();
+                    expect(reviewerStub.directFind).not.toHaveBeenCalled();
+                    return [2];
+            }
+        });
+    }); });
+    it('DCO 分类可由 CONTENT_DCO_TYPES 覆盖', function () { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
+        var doc, _a, ctx, reviewerStub;
+        return tslib_1.__generator(this, function (_b) {
+            switch (_b.label) {
+                case 0:
+                    doc = baseDoc({ classification: 'X-1' });
+                    _a = buildCtx({ doc: doc, matrixRows: [] }), ctx = _a.ctx, reviewerStub = _a.reviewerStub;
+                    return [4, expect(run(ctx, { CONTENT_DCO_TYPES: 'X-1,Y-2' })).resolves.toBeUndefined()];
+                case 1:
+                    _b.sent();
+                    expect(reviewerStub.directFind).not.toHaveBeenCalled();
+                    return [2];
+            }
+        });
+    }); });
+    it('只管草稿: 已进入流程的单保存时不校验', function () { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
+        var inFlight, inFlight_1, inFlight_1_1, step, doc, previousDoc, _a, ctx, reviewerStub, e_1_1;
+        var e_1, _b;
+        return tslib_1.__generator(this, function (_c) {
+            switch (_c.label) {
+                case 0:
+                    inFlight = ['ai_review', 'departmental_review', 'personnel_review', 'submitter_revisions', 'awaiting_deployment', 'conclusion'];
+                    _c.label = 1;
+                case 1:
+                    _c.trys.push([1, 6, 7, 8]);
+                    inFlight_1 = tslib_1.__values(inFlight), inFlight_1_1 = inFlight_1.next();
+                    _c.label = 2;
+                case 2:
+                    if (!!inFlight_1_1.done) return [3, 5];
+                    step = inFlight_1_1.value;
+                    doc = { remark: '流程中改点东西' };
+                    previousDoc = baseDoc({ current_step: step });
+                    _a = buildCtx({ doc: doc, previousDoc: previousDoc, isInsert: false, matrixRows: [] }), ctx = _a.ctx, reviewerStub = _a.reviewerStub;
+                    return [4, expect(run(ctx)).resolves.toBeUndefined()];
+                case 3:
+                    _c.sent();
+                    expect(reviewerStub.directFind).not.toHaveBeenCalled();
+                    _c.label = 4;
+                case 4:
+                    inFlight_1_1 = inFlight_1.next();
+                    return [3, 2];
+                case 5: return [3, 8];
+                case 6:
+                    e_1_1 = _c.sent();
+                    e_1 = { error: e_1_1 };
+                    return [3, 8];
+                case 7:
+                    try {
+                        if (inFlight_1_1 && !inFlight_1_1.done && (_b = inFlight_1.return)) _b.call(inFlight_1);
+                    }
+                    finally { if (e_1) throw e_1.error; }
+                    return [7];
+                case 8: return [2];
+            }
+        });
+    }); });
+    it('已中止的草稿不再校验, 避免挡住收尾操作', function () { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
+        var doc, previousDoc, _a, ctx, reviewerStub;
+        return tslib_1.__generator(this, function (_b) {
+            switch (_b.label) {
+                case 0:
+                    doc = { remark: 'x' };
+                    previousDoc = baseDoc({ current_step: 'draft', review_status: 'terminated' });
+                    _a = buildCtx({ doc: doc, previousDoc: previousDoc, isInsert: false, matrixRows: [] }), ctx = _a.ctx, reviewerStub = _a.reviewerStub;
+                    return [4, expect(run(ctx)).resolves.toBeUndefined()];
+                case 1:
+                    _b.sent();
+                    expect(reviewerStub.directFind).not.toHaveBeenCalled();
+                    return [2];
+            }
+        });
+    }); });
+    it('被拦下时把原始ID写进系统日志供管理员定位', function () { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
+        var doc, _a, ctx, logsStub, logged;
+        return tslib_1.__generator(this, function (_b) {
+            switch (_b.label) {
+                case 0:
+                    doc = baseDoc({ approval_type: 'departmental_review' });
+                    _a = buildCtx({ doc: doc, matrixRows: [] }), ctx = _a.ctx, logsStub = _a.logsStub;
+                    return [4, run(ctx).catch(function () { return null; })];
+                case 1:
+                    _b.sent();
+                    expect(logsStub.directInsert).toHaveBeenCalled();
+                    logged = JSON.parse(logsStub.directInsert.mock.calls[0][0].data);
+                    expect(logged.action).toBe('save-blocked-reviewer-missing');
+                    expect(logged.approval_name).toBe('2609095607');
+                    expect(logged.owner_department).toBe('org-1');
+                    expect(logged.classification).toBe('MD-SC1-SC16');
+                    expect(logged.missing).toEqual(['NS', 'Legal', 'SRA', 'CA']);
+                    return [2];
+            }
+        });
+    }); });
+    it('写日志失败不能把校验本身搞崩, 仍要正常抛出业务错误', function () { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
+        var doc, ctx;
+        return tslib_1.__generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    doc = baseDoc({ approval_type: 'departmental_review' });
+                    ctx = buildCtx({ doc: doc, matrixRows: [] }).ctx;
+                    ctx.getObject = jest.fn(function (name) {
+                        if (name === 'pepsico_reviewer')
+                            return { directFind: jest.fn().mockResolvedValue([]) };
+                        return { directInsert: jest.fn().mockRejectedValue(new Error('日志写入失败')) };
+                    });
+                    return [4, expect(run(ctx)).rejects.toThrow(/缺少NS、Legal、SRA、CA审核人/)];
+                case 1:
+                    _a.sent();
+                    return [2];
+            }
+        });
+    }); });
+    it('保留原有的内部协作者同步行为', function () { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
+        var doc, ctx, result;
+        return tslib_1.__generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    doc = baseDoc({
+                        approval_type: 'departmental_review',
+                        ns_reviewer: ['a'], legal_reviewer: ['b'], sra_reviewer: ['c'], ca_reviewer: ['d'],
+                        internal_collaborator_edit: 'collab-u'
+                    });
+                    ctx = buildCtx({ doc: doc, matrixRows: [] }).ctx;
+                    return [4, run(ctx)];
+                case 1:
+                    result = _a.sent();
+                    expect(result).toEqual({ doc: { internal_collaborator: 'collab-u' } });
+                    return [2];
+            }
+        });
+    }); });
+});
+//# sourceMappingURL=approvalReviewerTrigger.test.js.map

package/lib/methods/__tests__/approvalReviewerTrigger.test.js.map

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

package/main/default/objects/pepsico_km_pls_file/fields/pls_file.field.yml

@@ -1,9 +1,24 @@
 name: pls_file
 amis:
   id: 'u:be441c91bd73'
+  # 覆盖平台默认的 file 只读渲染。平台默认取 ${pls_file|asArray} 的 value/name,
+  # 该值只有列表视图的响应适配器(getTableApi)会重写成对象数组; lookup 弹窗(picker)的
+  # 适配器没有这段重写, 字段值仍是裸文件 id 字符串, 导致 value 取空 ->
+  # 点击后打开 cfs_files_filerecord 记录抽屉时报"无法找到记录"。
+  # 这里统一改为从 _display 取值(列表、lookup 弹窗、记录详情三处都有 _display),
+  # 并去掉 url 上的 download 参数, 让 PDF 在新标签页内联预览而不是直接下载。
+  body:
+    type: each
+    source: '${_display.pls_file|asArray}'
+    className: flex flex-col
+    items:
+      type: tpl
+      tpl: >-
+        <% if(data && data.url){ %><a href="<%= data.url.split('?')[0] %>"
+        target="_blank"><%= data.name %></a><% } %>
 group: 上传信息
 is_wide: true
-label: PLS原始文件查看
+label: PLS文件
 readonly: true
 required: false
 sort_no: 150

package/main/default/objects/pepsico_km_pls_file/listviews/lookup.listview.yml

@@ -1,6 +1,8 @@
 name: lookup
 columns:
-  - field: name
+  - field: pls_file
+    width: '300'
+    wrap: true
   - field: product_name
   - field: brand
   - field: issue_date

package/main/default/triggers/pepsico_material_approval_change.trigger.yml

@@ -6,30 +6,140 @@ when:
 isEnabled: true
 handler: |-
   const { _ } = global;
-  const { doc } = ctx.params;
-  if(ctx.params.isInsert){
-    if(doc.approval_type === 'personnel_review'){
-      if(_.isEmpty(doc.reviewer)){
-        throw new Error('固定审核人缺失, 请确认审批单对应审核人员信息');
-      }
+  const { doc, previousDoc } = ctx.params;
+
+  // 保存审批单时的审核人兜底与校验 (#450)
+  //
+  // 审核人原本只由 amis 字段的 onEvent.change 链回填, 服务端没有任何补偿。
+  // 前端链一断(链首 ajax 是 ignoreError:false、owner_department 没有 change 事件、
+  // 矩阵查不到时 adaptor 返回 {} 把已有值抹掉), 单子就带着空审核人存进来,
+  // 一路走到部门审核才因取不到审核人而中断, 静默卡死且无告警。
+  //
+  // 这里在保存这一刻就按角色矩阵补齐, 补不上就拦下 —— 空审核人的单子根本不该存进库。
+  //
+  // 只管草稿阶段: 审批过程中的修改、退回给提交人修改等都不该被拦,
+  // 那时单子早已在流程里, 再拦只会挡住正常操作。
+
+  // beforeUpdate 的 doc 只含本次变更字段, 必须和 previousDoc 合并后再判,
+  // 否则任何不碰审核人的更新(改个备注)都会被误判成"审核人为空"而拦死。
+  const record = _.assign({}, previousDoc || {}, doc);
+
+  const isBlank = (v) => _.isArray(v) ? _.isEmpty(_.compact(v)) : _.isEmpty(v);
+  // tree-select 在不同配置下可能给出字符串或单元素数组, 查矩阵时统一成字符串
+  const matrixKey = (v) => _.isArray(v) ? _.compact(v)[0] : v;
+
+  // 与 src/const.ts 一致: DCO 分类跳过审核直接归档, 不需要审核人
+  const dcoTypes = _.split(
+    (typeof process !== 'undefined' && process.env && process.env.CONTENT_DCO_TYPES) || 'MD-PO1-PO18',
+    ','
+  );
+
+  // 新建的单子一律是草稿(init 触发器在 beforeInsert 无条件写 current_step=draft),
+  // 直接认 isInsert 而不读 doc.current_step —— 两个 beforeInsert 触发器的执行顺序没有保证。
+  const isDraft = ctx.params.isInsert === true || record.current_step === 'draft';
+
+  const needsReviewers = isDraft
+    && record.review_status !== 'terminated'
+    && !_.includes(dcoTypes, record.classification);
+
+  if(needsReviewers){
+    // 角色矩阵(pepsico_reviewer)与审批单上同名的字段。显式列出是为了圈定范围,
+    // 避免把矩阵行上的其它字段(name / org / remark 等)一起写进审批单。
+    const MATRIX_FIELDS = [
+      'reviewer', 'assistance',
+      'ns_reviewer', 'ns_assistance',
+      'legal_reviewer', 'legal_assistance',
+      'sra_reviewer', 'sra_assistance',
+      'ca_reviewer', 'ca_assistance',
+      'qc_reviewer', 'qc_assistance',
+      'can_pass_users',
+      'pre_reviewer', 'pre_ns_reviewer', 'pre_legal_reviewer', 'pre_sra_reviewer', 'pre_ca_reviewer', 'pre_qc_reviewer'
+    ];
+
+    const classification = matrixKey(record.classification);
+    const product = matrixKey(record.product);
+    const org = matrixKey(record.owner_department);
+
+    let row = null;
+    if(classification && product && org){
+      // 矩阵上这三个字段都是 multiple, 审批单上是单值, 所以 '=' 即"矩阵行包含该值"。
+      // 用 directFind 绕权限: 发起人通常没有角色矩阵的读权限, 走 find 会读不到而误判成"未配置"。
+      const rows = await ctx.getObject('pepsico_reviewer').directFind({
+        filters: [
+          ['classification', '=', classification],
+          ['product', '=', product],
+          ['org', '=', org],
+          ['space', '=', record.space || ctx.params.spaceId]
+        ],
+        sort: 'modified desc',
+        top: 1
+      });
+      row = rows && rows.length > 0 ? rows[0] : null;
     }
 
-    if(doc.approval_type === 'departmental_review'){
-      if(_.isEmpty(doc.ca_reviewer)){
-        throw new Error('CA审核人缺失, 请确认审批单对应审核人员信息');
-      }
-      if(_.isEmpty(doc.legal_reviewer)){
-        throw new Error('Legal审核人缺失, 请确认审批单对应审核人员信息');
-      }
-      if(_.isEmpty(doc.ns_reviewer)){
-        throw new Error('NS审核人缺失, 请确认审批单对应审核人员信息');
-      }
-      if(_.isEmpty(doc.sra_reviewer)){
-        throw new Error('SRA审核人缺失, 请确认审批单对应审核人员信息');
+    if(row){
+      // 只补空, 不覆盖 —— 加急换人、管理员手工调整过的值必须保住, 覆盖会伤存量数据
+      _.each(MATRIX_FIELDS, (field) => {
+        if(isBlank(record[field]) && !isBlank(row[field])){
+          doc[field] = row[field];
+          record[field] = row[field];
+        }
+      });
+    }
+
+    const deptLabels = {
+      ns_reviewer: 'NS',
+      legal_reviewer: 'Legal',
+      sra_reviewer: 'SRA',
+      ca_reviewer: 'CA'
+    };
+    if(record.ec_has_detail_page === 'yes'){
+      deptLabels.qc_reviewer = 'QC';
+    }
+    const missingDepts = _.filter(_.keys(deptLabels), (field) => isBlank(record[field]));
+    const hasPersonnel = !isBlank(record.reviewer);
+
+    let missing = [];
+    if(record.approval_type === 'personnel_review'){
+      if(!hasPersonnel){
+        missing = ['固定'];
       }
-      if(doc.ec_has_detail_page === 'yes' && _.isEmpty(doc.qc_reviewer)){
-        throw new Error('QC审核人缺失, 请确认审批单对应审核人员信息');
+    }else if(record.approval_type === 'departmental_review'){
+      missing = _.map(missingDepts, (field) => deptLabels[field]);
+    }else if(!hasPersonnel && missingDepts.length > 0){
+      // approval_type 为空恰恰是最危险的情况: 它和审核人来自同一条前端链, 链断则两者同时为空。
+      // 旧逻辑在这里直接跳过校验, 空审核人的单子就是这样进来的, 所以不能以它有值为前提。
+      // 此时无法确定后续会走哪条分支(approval_type 由服务端在提交时重算),
+      // 要求至少有一套可用的审核人: 固定人员, 或四部门齐全。
+      missing = _.map(missingDepts, (field) => deptLabels[field]);
+    }
+
+    if(missing.length > 0){
+      // 原始 ID 写系统日志给管理员定位; 发起人就在表单上, 分类/品牌/部门他看得见, 不必回显
+      try {
+        await ctx.getObject('logs').directInsert({
+          name: '保存被拦截: 审核人缺失',
+          level: 'error',
+          data: JSON.stringify({
+            action: 'save-blocked-reviewer-missing',
+            id: record._id || ctx.params.id,
+            approval_name: record.name,
+            is_insert: ctx.params.isInsert === true,
+            missing: missing,
+            matched_pepsico_reviewer: row ? row._id : null,
+            approval_type: record.approval_type || null,
+            classification: classification,
+            product: product,
+            owner_department: org
+          }),
+          space: record.space || ctx.params.spaceId,
+          created: new Date()
+        });
+      } catch (e) {
+        console.error('[pepsico_material_approval_change] 写系统日志失败', e && e.message);
       }
+
+      throw new Error('缺少' + missing.join('、') + '审核人, 请联系管理员为当前「分类 + 品牌/产品 + 发起人部门」的组合配置角色矩阵后重试。');
     }
   }
 
@@ -40,7 +150,7 @@ handler: |-
       }
     }
   }
-  
+
 authentication_type: none
 locked: false
 type: code

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@steedos-labs/content-compliance",
-    "version": "0.8.26",
+    "version": "0.8.27",
     "description": "内容审核系统",
     "main": "package.service.js",
     "scripts": {