@steedos-labs/content-compliance 0.7.11 → 0.7.13

package/lib/methods/__tests__/__mocks__/empty.js.map

@@ -1 +1 @@
-{"version":3,"file":"empty.js","sourceRoot":"","sources":["../../../../src/methods/__tests__/__mocks__/empty.ts"],"names":[],"mappings":";;AACA,kBAAe,EAAE,CAAC"}
+{"version":3,"file":"empty.js","sourceRoot":"","sources":["../../../../src/methods/__tests__/__mocks__/empty.ts"],"names":[],"mappings":";;AAAA,kBAAe,EAAE,CAAC"}

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

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

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

@@ -0,0 +1,39 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+var tslib_1 = require("tslib");
+var approval_engine_1 = require("../approval_engine");
+var consts_1 = require("../consts");
+var baseApproval = {
+    _id: 'approval-1',
+    owner: 'owner-1',
+    space: 'space-1',
+    name: '测试审批单',
+    current_step: consts_1.Step.departmental_review,
+    ca_reviewer: ['reviewer-1'],
+    kids_reviewer: 'reviewer-1',
+    handler_ca: ['reviewer-1'],
+    handler_kids: ['reviewer-1'],
+    ca_approval_status: false,
+    kids_approval_status: false
+};
+describe('postpone review department resolution', function () {
+    it('uses CA when the same user is both CA and Kids and Kids is the latest process', function () {
+        var departmentType = (0, approval_engine_1.getPostponeReviewDepartmentType)(baseApproval, [
+            { type: consts_1.ProcessApprovalType.Kids },
+            { type: consts_1.ProcessApprovalType.CA }
+        ]);
+        expect(departmentType).toBe(consts_1.ProcessApprovalType.CA);
+    });
+    it('still blocks users who only have a Kids approval role', function () {
+        expect(function () { return (0, approval_engine_1.getPostponeReviewDepartmentType)(tslib_1.__assign(tslib_1.__assign({}, baseApproval), { ca_approval_status: '', handler_ca: [] }), [
+            { type: consts_1.ProcessApprovalType.Kids }
+        ], 'reviewer-1'); }).toThrow('Kids审核人不支持延后审核操作');
+    });
+    it('falls back to handler fields when process history only exposes Kids', function () {
+        var departmentType = (0, approval_engine_1.getPostponeReviewDepartmentType)(baseApproval, [
+            { type: consts_1.ProcessApprovalType.Kids }
+        ], 'reviewer-1');
+        expect(departmentType).toBe(consts_1.ProcessApprovalType.CA);
+    });
+});
+//# sourceMappingURL=postponeReview.test.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"postponeReview.test.js","sourceRoot":"","sources":["../../../src/methods/__tests__/postponeReview.test.ts"],"names":[],"mappings":";;;AAAA,sDAAqE;AACrE,oCAAsD;AAEtD,IAAM,YAAY,GAAQ;IACtB,GAAG,EAAE,YAAY;IACjB,KAAK,EAAE,SAAS;IAChB,KAAK,EAAE,SAAS;IAChB,IAAI,EAAE,OAAO;IACb,YAAY,EAAE,aAAI,CAAC,mBAAmB;IACtC,WAAW,EAAE,CAAC,YAAY,CAAC;IAC3B,aAAa,EAAE,YAAY;IAC3B,UAAU,EAAE,CAAC,YAAY,CAAC;IAC1B,YAAY,EAAE,CAAC,YAAY,CAAC;IAC5B,kBAAkB,EAAE,KAAK;IACzB,oBAAoB,EAAE,KAAK;CAC9B,CAAC;AAEF,QAAQ,CAAC,uCAAuC,EAAE;IAC9C,EAAE,CAAC,+EAA+E,EAAE;QAChF,IAAM,cAAc,GAAG,IAAA,iDAA+B,EAAC,YAAY,EAAE;YACjE,EAAE,IAAI,EAAE,4BAAmB,CAAC,IAAI,EAAE;YAClC,EAAE,IAAI,EAAE,4BAAmB,CAAC,EAAE,EAAE;SACnC,CAAC,CAAC;QAEH,MAAM,CAAC,cAAc,CAAC,CAAC,IAAI,CAAC,4BAAmB,CAAC,EAAE,CAAC,CAAC;IACxD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,uDAAuD,EAAE;QACxD,MAAM,CAAC,cAAM,OAAA,IAAA,iDAA+B,wCACrC,YAAY,KACf,kBAAkB,EAAE,EAAE,EACtB,UAAU,EAAE,EAAE,KACf;YACC,EAAE,IAAI,EAAE,4BAAmB,CAAC,IAAI,EAAE;SACrC,EAAE,YAAY,CAAC,EANH,CAMG,CAAC,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC;IAClD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,qEAAqE,EAAE;QACtE,IAAM,cAAc,GAAG,IAAA,iDAA+B,EAAC,YAAY,EAAE;YACjE,EAAE,IAAI,EAAE,4BAAmB,CAAC,IAAI,EAAE;SACrC,EAAE,YAAY,CAAC,CAAC;QAEjB,MAAM,CAAC,cAAc,CAAC,CAAC,IAAI,CAAC,4BAAmB,CAAC,EAAE,CAAC,CAAC;IACxD,CAAC,CAAC,CAAC;AACP,CAAC,CAAC,CAAC"}

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

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

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

@@ -0,0 +1,121 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+var tslib_1 = require("tslib");
+var urgent_1 = require("../urgent");
+var consts_1 = require("../consts");
+var baseApproval = {
+    _id: 'approval-1',
+    owner: 'user-1',
+    space: 'space-1',
+    name: '测试审批单',
+    current_step: consts_1.Step.departmental_review,
+    review_postponed_users: [],
+    is_urgent: false,
+    urgent_times: 0,
+    person_pending_approve: []
+};
+var createCtx = function (_a) {
+    var _b = _a === void 0 ? {} : _a, _c = _b.approval, approval = _c === void 0 ? baseApproval : _c, _d = _b.quota, quota = _d === void 0 ? { _id: 'quota-1', h1_used: 0, h2_used: 0 } : _d;
+    var objects = {
+        pepsico_material_approval: {
+            findOne: jest.fn(function () { return tslib_1.__awaiter(void 0, void 0, void 0, function () { return tslib_1.__generator(this, function (_a) {
+                return [2, approval];
+            }); }); }),
+            directUpdate: jest.fn()
+        },
+        pepsico_urgent_quota: {
+            findOne: jest.fn(function () { return tslib_1.__awaiter(void 0, void 0, void 0, function () { return tslib_1.__generator(this, function (_a) {
+                return [2, quota];
+            }); }); }),
+            directUpdate: jest.fn(),
+            insert: jest.fn()
+        },
+        pepsico_urgent_log: {
+            insert: jest.fn()
+        },
+        space_users: {
+            findOne: jest.fn(function () { return tslib_1.__awaiter(void 0, void 0, void 0, function () { return tslib_1.__generator(this, function (_a) {
+                return [2, ({ is_collaborator: false })];
+            }); }); }),
+            find: jest.fn(function () { return tslib_1.__awaiter(void 0, void 0, void 0, function () { return tslib_1.__generator(this, function (_a) {
+                return [2, []];
+            }); }); })
+        }
+    };
+    return {
+        objects: objects,
+        ctx: {
+            getObject: jest.fn(function (name) { return objects[name]; }),
+            broker: {
+                call: jest.fn()
+            }
+        }
+    };
+};
+describe('urgent approval', function () {
+    beforeEach(function () {
+        jest.useFakeTimers().setSystemTime(new Date('2026-05-30T00:00:00.000Z'));
+    });
+    afterEach(function () {
+        jest.useRealTimers();
+    });
+    it('does not allow urgent approval when reviewers are postponed', function () { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
+        var ctx;
+        return tslib_1.__generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    ctx = createCtx({
+                        approval: tslib_1.__assign(tslib_1.__assign({}, baseApproval), { review_postponed_users: ['reviewer-1'] })
+                    }).ctx;
+                    return [4, expect((0, urgent_1.canUrgent)(ctx, 'approval-1', 'user-1')).resolves.toEqual({
+                            canUrgent: false,
+                            reason: '存在延后审核人，无法加急'
+                        })];
+                case 1:
+                    _a.sent();
+                    return [2];
+            }
+        });
+    }); });
+    it('does not allow urgent approval when quota is not configured', function () { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
+        var ctx;
+        return tslib_1.__generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    ctx = createCtx({ quota: null }).ctx;
+                    return [4, expect((0, urgent_1.canUrgent)(ctx, 'approval-1', 'user-1')).resolves.toEqual({
+                            canUrgent: false,
+                            reason: '未配置加急次数',
+                            quota: {
+                                available: 0,
+                                used: 0,
+                                total: 0,
+                                year: 2026,
+                                half: 1,
+                                configured: false
+                            }
+                        })];
+                case 1:
+                    _a.sent();
+                    return [2];
+            }
+        });
+    }); });
+    it('does not auto-create quota records when executing urgent approval without configuration', function () { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
+        var _a, ctx, objects;
+        return tslib_1.__generator(this, function (_b) {
+            switch (_b.label) {
+                case 0:
+                    _a = createCtx({ quota: null }), ctx = _a.ctx, objects = _a.objects;
+                    return [4, expect((0, urgent_1.doUrgent)(ctx, 'approval-1', 'user-1')).rejects.toThrow('未配置加急次数')];
+                case 1:
+                    _b.sent();
+                    expect(objects.pepsico_urgent_quota.insert).not.toHaveBeenCalled();
+                    expect(objects.pepsico_material_approval.directUpdate).not.toHaveBeenCalled();
+                    expect(objects.pepsico_urgent_log.insert).not.toHaveBeenCalled();
+                    return [2];
+            }
+        });
+    }); });
+});
+//# sourceMappingURL=urgent.test.js.map

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

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

package/lib/methods/approval_engine.d.ts

@@ -1,4 +1,4 @@
-import { MaterialApproval, ApprovalStatus } from "./consts";
+import { MaterialApproval, ApprovalStatus, ProcessApprovalType } from "./consts";
 export declare const getDefApproverStepRule: (ctx: any) => Promise<any>;
 export declare const getApproverStepRule: (ctx: any, ruleId?: string) => Promise<any>;
 export declare const hasAnyPreReviewer: (materialApproval: MaterialApproval, approvalType: string) => boolean;
@@ -36,4 +36,5 @@ export declare const submitContent: (ctx: any, recordId: any, currentStepApprova
     data: {};
 }>;
 export declare const hasReviewed: (approvalStatus: any) => boolean;
+export declare const getPostponeReviewDepartmentType: (record: MaterialApproval, userProcessRecords: any[], userId?: string) => ProcessApprovalType;
 export declare const postponeReview: (ctx: any, recordId: any, data: any) => Promise<{}>;

package/lib/methods/approval_engine.js

@@ -1,7 +1,7 @@
 "use strict";
-var _a;
+var _a, _b, _c;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.postponeReview = exports.hasReviewed = exports.submitContent = exports.submitPreReviewContent = exports.submitKidsContent = exports.rejectContent = exports.approvalContent = exports.postponeDeployment = exports.confirmDeployment = exports.terminate = exports.advanceApproval = exports.hasNonPreReviewDepartments = exports.getPreReviewStatuses = exports.getDeptEffectiveStatus = exports.isDeptReviewComplete = exports.hasAnyPreReviewer = exports.getApproverStepRule = exports.getDefApproverStepRule = void 0;
+exports.postponeReview = exports.getPostponeReviewDepartmentType = exports.hasReviewed = exports.submitContent = exports.submitPreReviewContent = exports.submitKidsContent = exports.rejectContent = exports.approvalContent = exports.postponeDeployment = exports.confirmDeployment = exports.terminate = exports.advanceApproval = exports.hasNonPreReviewDepartments = exports.getPreReviewStatuses = exports.getDeptEffectiveStatus = exports.isDeptReviewComplete = exports.hasAnyPreReviewer = exports.getApproverStepRule = exports.getDefApproverStepRule = void 0;
 var tslib_1 = require("tslib");
 var consts_1 = require("./consts");
 var amis_formula_1 = require("amis-formula");
@@ -2063,9 +2063,86 @@ var TYPE_TO_REVIEWER_FIELD = (_a = {},
     _a[consts_1.ProcessApprovalType.PreCA] = 'pre_ca_reviewer',
     _a[consts_1.ProcessApprovalType.Preguding] = 'pre_reviewer',
     _a);
+var TYPE_TO_HANDLER_FIELD = (_b = {},
+    _b[consts_1.ProcessApprovalType.NS] = 'handler_ns',
+    _b[consts_1.ProcessApprovalType.Legal] = 'handler_legal',
+    _b[consts_1.ProcessApprovalType.SRA] = 'handler_sra',
+    _b[consts_1.ProcessApprovalType.CA] = 'handler_ca',
+    _b[consts_1.ProcessApprovalType.guding] = 'handler_guding',
+    _b[consts_1.ProcessApprovalType.Kids] = 'handler_kids',
+    _b[consts_1.ProcessApprovalType.PreNS] = 'handler_prens',
+    _b[consts_1.ProcessApprovalType.PreLegal] = 'handler_prelegal',
+    _b[consts_1.ProcessApprovalType.PreSRA] = 'handler_presra',
+    _b[consts_1.ProcessApprovalType.PreCA] = 'handler_preca',
+    _b[consts_1.ProcessApprovalType.Preguding] = 'handler_preguding',
+    _b);
+var TYPE_TO_STATUS_FIELD = (_c = {},
+    _c[consts_1.ProcessApprovalType.NS] = 'ns_approval_status',
+    _c[consts_1.ProcessApprovalType.Legal] = 'legal_approval_status',
+    _c[consts_1.ProcessApprovalType.SRA] = 'sra_approval_status',
+    _c[consts_1.ProcessApprovalType.CA] = 'ca_approval_status',
+    _c[consts_1.ProcessApprovalType.guding] = 'approval_status',
+    _c[consts_1.ProcessApprovalType.Kids] = 'kids_approval_status',
+    _c[consts_1.ProcessApprovalType.PreNS] = 'pre_ns_approval_status',
+    _c[consts_1.ProcessApprovalType.PreLegal] = 'pre_legal_approval_status',
+    _c[consts_1.ProcessApprovalType.PreSRA] = 'pre_sra_approval_status',
+    _c[consts_1.ProcessApprovalType.PreCA] = 'pre_ca_approval_status',
+    _c[consts_1.ProcessApprovalType.Preguding] = 'pre_approval_status',
+    _c);
+var POSTPONE_REVIEW_TYPE_PRIORITY = [
+    consts_1.ProcessApprovalType.CA,
+    consts_1.ProcessApprovalType.SRA,
+    consts_1.ProcessApprovalType.NS,
+    consts_1.ProcessApprovalType.Legal,
+    consts_1.ProcessApprovalType.guding,
+    consts_1.ProcessApprovalType.PreCA,
+    consts_1.ProcessApprovalType.PreSRA,
+    consts_1.ProcessApprovalType.PreNS,
+    consts_1.ProcessApprovalType.PreLegal,
+    consts_1.ProcessApprovalType.Preguding
+];
+var getUsersValue = function (val) {
+    if (!val)
+        return [];
+    return Array.isArray(val) ? val : [val];
+};
+var isUserInRecordType = function (record, type, userId) {
+    var handlerField = TYPE_TO_HANDLER_FIELD[type];
+    var reviewerField = TYPE_TO_REVIEWER_FIELD[type];
+    var handlerUsers = handlerField ? getUsersValue(record[handlerField]) : [];
+    var reviewerUsers = reviewerField ? getUsersValue(record[reviewerField]) : [];
+    var candidateUsers = handlerUsers.length > 0 ? handlerUsers : reviewerUsers;
+    return (0, lodash_1.includes)(candidateUsers, userId);
+};
+var getPostponeReviewDepartmentType = function (record, userProcessRecords, userId) {
+    var processTypes = (0, lodash_1.compact)((0, lodash_1.uniq)((0, lodash_1.map)(userProcessRecords || [], 'type')));
+    var eligibleProcessType = processTypes.find(function (type) {
+        if (type === consts_1.ProcessApprovalType.Kids)
+            return false;
+        var statusField = TYPE_TO_STATUS_FIELD[type];
+        return !!statusField && record[statusField] === false;
+    });
+    if (eligibleProcessType) {
+        return eligibleProcessType;
+    }
+    if (userId) {
+        var eligibleRecordType = POSTPONE_REVIEW_TYPE_PRIORITY.find(function (type) {
+            var statusField = TYPE_TO_STATUS_FIELD[type];
+            return !!statusField && record[statusField] === false && isUserInRecordType(record, type, userId);
+        });
+        if (eligibleRecordType) {
+            return eligibleRecordType;
+        }
+    }
+    if (processTypes.includes(consts_1.ProcessApprovalType.Kids) || (userId && isUserInRecordType(record, consts_1.ProcessApprovalType.Kids, userId))) {
+        throw new Error('Kids审核人不支持延后审核操作');
+    }
+    throw new Error('仅驳回审批单后可以延后审核');
+};
+exports.getPostponeReviewDepartmentType = getPostponeReviewDepartmentType;
 var postponeReview = function (ctx, recordId, data) {
     return tslib_1.__awaiter(this, void 0, void 0, function () {
-        var user, record, progessRecords, userProcessRecords, departmentType, reviewerField, deptUserIds, val, now, unactivatedMarkers, latestMarker, _a, _b, marker, e_13_1, visibleAfter, markersToActivate, markersToActivate_1, markersToActivate_1_1, marker, e_14_1, currentRecord, currentPostponed, newPostponed;
+        var user, record, reviewSteps, progessRecords, userProcessRecords, departmentType, statusField, reviewerField, handlerField, deptUserIds, now, unactivatedMarkers, latestMarker, _a, _b, marker, e_13_1, currentMarkerUsers, newMarkerUsers, visibleAfter, markersToActivate, markersToActivate_1, markersToActivate_1_1, marker, e_14_1, currentRecord, currentPostponed, newPostponed;
         var e_13, _c, e_14, _d;
         return tslib_1.__generator(this, function (_e) {
             switch (_e.label) {
@@ -2074,9 +2151,13 @@ var postponeReview = function (ctx, recordId, data) {
                     return [4, ctx.getObject('pepsico_material_approval').findOne(recordId)];
                 case 1:
                     record = _e.sent();
-                    if (record.current_step !== consts_1.Step.departmental_review && record.current_step !== consts_1.Step.personnel_review) {
+                    reviewSteps = [consts_1.Step.departmental_review, consts_1.Step.personnel_review];
+                    if (!reviewSteps.includes(record.current_step) && record.current_step !== consts_1.Step.submitter_revisions) {
                         throw new Error('当前步骤不支持延后审核操作');
                     }
+                    if (record.is_urgent) {
+                        throw new Error('加急审批单不允许延后审核');
+                    }
                     if (!(0, lodash_1.includes)(record.person_approved, user.userId)) {
                         throw new Error('您不在当前已审批人列表中');
                     }
@@ -2100,22 +2181,28 @@ var postponeReview = function (ctx, recordId, data) {
                                 ['space', '=', record.space]
                             ],
                             sort: 'created desc',
-                            top: 1
                         })];
                 case 3:
                     userProcessRecords = _e.sent();
                     if (!userProcessRecords || userProcessRecords.length === 0) {
                         throw new Error('未找到您的审核记录');
                     }
-                    departmentType = userProcessRecords[0].type;
+                    departmentType = (0, exports.getPostponeReviewDepartmentType)(record, userProcessRecords, user.userId);
                     if (!departmentType) {
                         throw new Error('无法确定您所在的审核部门');
                     }
+                    statusField = TYPE_TO_STATUS_FIELD[departmentType];
+                    if (!statusField || record[statusField] !== false) {
+                        throw new Error('仅驳回审批单后可以延后审核');
+                    }
                     reviewerField = TYPE_TO_REVIEWER_FIELD[departmentType];
+                    handlerField = TYPE_TO_HANDLER_FIELD[departmentType];
                     deptUserIds = [];
-                    if (reviewerField && record[reviewerField]) {
-                        val = record[reviewerField];
-                        deptUserIds = Array.isArray(val) ? val : [val];
+                    if (handlerField && record[handlerField]) {
+                        deptUserIds = getUsersValue(record[handlerField]);
+                    }
+                    else if (reviewerField && record[reviewerField]) {
+                        deptUserIds = getUsersValue(record[reviewerField]);
                     }
                     if (deptUserIds.length === 0) {
                         deptUserIds = [user.userId];
@@ -2199,6 +2286,16 @@ var postponeReview = function (ctx, recordId, data) {
                     _e.label = 16;
                 case 16:
                     console.log("[postponeReview] recordId=".concat(recordId, ", departmentType=").concat(departmentType, ", deptUserIds=").concat(deptUserIds, ", markedForNextRound=true"));
+                    if (!(record.current_step === consts_1.Step.submitter_revisions)) return [3, 18];
+                    currentMarkerUsers = record.postpone_marker_users || [];
+                    newMarkerUsers = (0, lodash_1.compact)((0, lodash_1.uniq)((0, lodash_1.concat)(currentMarkerUsers, deptUserIds)));
+                    return [4, ctx.getObject('pepsico_material_approval').directUpdate(recordId, {
+                            postpone_marker_users: newMarkerUsers
+                        })];
+                case 17:
+                    _e.sent();
+                    return [2, {}];
+                case 18:
                     visibleAfter = new Date(now.getTime() + 3 * 24 * 60 * 60 * 1000);
                     return [4, ctx.getObject('pepsico_review_postpone').directFind({
                             filters: [
@@ -2208,15 +2305,15 @@ var postponeReview = function (ctx, recordId, data) {
                                 ['space', '=', record.space]
                             ]
                         })];
-                case 17:
+                case 19:
                     markersToActivate = _e.sent();
-                    _e.label = 18;
-                case 18:
-                    _e.trys.push([18, 23, 24, 25]);
+                    _e.label = 20;
+                case 20:
+                    _e.trys.push([20, 25, 26, 27]);
                     markersToActivate_1 = tslib_1.__values(markersToActivate), markersToActivate_1_1 = markersToActivate_1.next();
-                    _e.label = 19;
-                case 19:
-                    if (!!markersToActivate_1_1.done) return [3, 22];
+                    _e.label = 21;
+                case 21:
+                    if (!!markersToActivate_1_1.done) return [3, 24];
                     marker = markersToActivate_1_1.value;
                     return [4, ctx.getObject('pepsico_review_postpone').directUpdate(marker._id, {
                             is_marker: false,
@@ -2226,32 +2323,32 @@ var postponeReview = function (ctx, recordId, data) {
                             modified: now,
                             modified_by: user.userId
                         })];
-                case 20:
+                case 22:
                     _e.sent();
-                    _e.label = 21;
-                case 21:
-                    markersToActivate_1_1 = markersToActivate_1.next();
-                    return [3, 19];
-                case 22: return [3, 25];
+                    _e.label = 23;
                 case 23:
+                    markersToActivate_1_1 = markersToActivate_1.next();
+                    return [3, 21];
+                case 24: return [3, 27];
+                case 25:
                     e_14_1 = _e.sent();
                     e_14 = { error: e_14_1 };
-                    return [3, 25];
-                case 24:
+                    return [3, 27];
+                case 26:
                     try {
                         if (markersToActivate_1_1 && !markersToActivate_1_1.done && (_d = markersToActivate_1.return)) _d.call(markersToActivate_1);
                     }
                     finally { if (e_14) throw e_14.error; }
                     return [7];
-                case 25: return [4, ctx.getObject('pepsico_material_approval').findOne(recordId)];
-                case 26:
+                case 27: return [4, ctx.getObject('pepsico_material_approval').findOne(recordId)];
+                case 28:
                     currentRecord = _e.sent();
                     currentPostponed = currentRecord.review_postponed_users || [];
                     newPostponed = (0, lodash_1.compact)((0, lodash_1.uniq)((0, lodash_1.concat)(currentPostponed, deptUserIds)));
                     return [4, ctx.getObject('pepsico_material_approval').directUpdate(recordId, {
                             review_postponed_users: newPostponed
                         })];
-                case 27:
+                case 29:
                     _e.sent();
                     console.log("[postponeReview] \u7ACB\u5373\u6FC0\u6D3B\u5EF6\u540E: recordId=".concat(recordId, ", deptUserIds=").concat(deptUserIds, ", visibleAfter=").concat(visibleAfter));
                     return [2, {}];