@steedos-labs/content-compliance 0.8.22 → 0.8.24

package/lib/methods/approval_engine.js

@@ -1,7 +1,7 @@
 "use strict";
 var _a, _b, _c;
 Object.defineProperty(exports, "__esModule", { value: true });
-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.getDepartmentEffectiveStatuses = exports.areDepartmentReviewsComplete = exports.hasNonPreReviewDepartments = exports.getPreReviewStatuses = exports.needsPLSReReview = exports.needsQcReview = 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.getDepartmentEffectiveStatuses = exports.areDepartmentReviewsComplete = exports.hasNonPreReviewDepartments = exports.getPreReviewStatuses = exports.addFormalReviewerAfterPreApproval = exports.needsPLSReReview = exports.needsQcReview = 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");
@@ -154,7 +154,8 @@ var needsQcReview = function (materialApproval) {
 exports.needsQcReview = needsQcReview;
 var needsPLSReReview = function (materialApproval) {
     return !_.isEmpty(materialApproval.pls_km_files)
-        && (materialApproval.sra_approval_status === false || materialApproval.qc_approval_status === false);
+        && ((0, exports.getDeptEffectiveStatus)(materialApproval, 'sra') === false
+            || ((0, exports.needsQcReview)(materialApproval) && (0, exports.getDeptEffectiveStatus)(materialApproval, 'qc') === false));
 };
 exports.needsPLSReReview = needsPLSReReview;
 var requiresPLS = function (materialApproval) {
@@ -843,6 +844,7 @@ var addFormalReviewerAfterPreApproval = function (ctx, recordId, approveField, m
                 return [4, (0, agent_1.getReviewerAgentsInfo)(ctx, materialApproval.space, userIds)];
             case 1:
                 agents = _g.sent();
+                agents.userIds = (0, lodash_1.uniq)(agents.userIds);
                 user = ctx.meta.user;
                 _g.label = 2;
             case 2:
@@ -897,7 +899,7 @@ var addFormalReviewerAfterPreApproval = function (ctx, recordId, approveField, m
             case 12:
                 currentApproval = _g.sent();
                 pendingApprove = currentApproval.person_pending_approve || [];
-                newPending = (0, lodash_1.compact)((0, lodash_1.uniq)((0, lodash_1.concat)(pendingApprove, agents.userIds)));
+                newPending = (0, lodash_1.compact)((0, lodash_1.concat)(pendingApprove, agents.userIds));
                 return [4, ctx.getObject('pepsico_material_approval').directUpdate(materialApproval._id, (_e = {
                             person_pending_approve: newPending
                         },
@@ -916,6 +918,7 @@ var addFormalReviewerAfterPreApproval = function (ctx, recordId, approveField, m
         }
     });
 }); };
+exports.addFormalReviewerAfterPreApproval = addFormalReviewerAfterPreApproval;
 var getPreReviewStatuses = function (materialApproval) {
     var statuses = [];
     if (materialApproval.pre_ns_reviewer) {
@@ -974,110 +977,129 @@ var getDepartmentEffectiveStatuses = function (materialApproval) {
 };
 exports.getDepartmentEffectiveStatuses = getDepartmentEffectiveStatuses;
 var advanceApproval = function (ctx, recordId, currentStepApprovalStatus) { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
-    var actionLabel, user, record, nextStep, skipApprover, nextApprovers, _nextApprovers, nextApprovers_2, nextApprovers_2_1, reviewer, fieldName, status, e_7_1, nextApproversUserIds_1, nextApproversClientUserIds_1, setDoc, invalidated, nextApprovers_3, nextApprovers_3_1, nextApprover, e_8_1, setDoc_1, postponedUserIds_1, now, visibleAfter, pastPostponeRecords, postponedDepts, _loop_1, nextApprovers_4, nextApprovers_4_1, reviewer, e_9_1, currentRecord, currentPostponed, newPostponed, currentMarkerUsers, newMarkerUsers, notifyUserIds, initiator, materialOwner, error_1;
-    var e_7, _a, _b, _c, e_8, _d, e_9, _e;
-    return tslib_1.__generator(this, function (_f) {
-        switch (_f.label) {
+    var actionLabel, user, record, nextStep, skipApprover, nextApprovers, _nextApprovers, autoApproveUpdates, nextApprovers_2, nextApprovers_2_1, reviewer, fieldName, status, preInfo, formalStatus, formalReviewerIds, formalUserIds, formalAgents, e_7_1, nextApproversUserIds_1, nextApproversClientUserIds_1, setDoc, invalidated, nextApprovers_3, nextApprovers_3_1, nextApprover, e_8_1, setDoc_1, postponedUserIds_1, now, visibleAfter, pastPostponeRecords, postponedDepts, _loop_1, nextApprovers_4, nextApprovers_4_1, reviewer, e_9_1, currentRecord, currentPostponed, newPostponed, currentMarkerUsers, newMarkerUsers, notifyUserIds, initiator, materialOwner, error_1;
+    var e_7, _a, _b, e_8, _c, e_9, _d;
+    return tslib_1.__generator(this, function (_e) {
+        switch (_e.label) {
             case 0:
-                _f.trys.push([0, 107, , 108]);
+                _e.trys.push([0, 110, , 111]);
                 actionLabel = '请查看';
                 user = ctx.meta.user;
                 return [4, ctx.getObject('pepsico_material_approval').findOne(recordId)];
             case 1:
-                record = _f.sent();
+                record = _e.sent();
                 console.log('[advanceApproval]', record.current_step, record.person_pending_approve, user.userId);
                 return [4, canSubmit(record)];
             case 2:
-                _f.sent();
+                _e.sent();
                 return [4, getNextStep(ctx, record, currentStepApprovalStatus)];
             case 3:
-                nextStep = _f.sent();
+                nextStep = _e.sent();
                 return [4, isSkipApprover(ctx, record)];
             case 4:
-                skipApprover = _f.sent();
+                skipApprover = _e.sent();
                 if (!(nextStep === consts_1.Step.conclusion && skipApprover)) return [3, 8];
                 return [4, ctx.getObject('pepsico_material_approval').directUpdate(record._id, {
                         is_skip_approver: true
                     })];
             case 5:
-                _f.sent();
+                _e.sent();
                 return [4, ctx.getObject('pepsico_material').directUpdateMany(['pepsico_material_approval', '=', record._id], {
                         is_skip_approver: true
                     })];
             case 6:
-                _f.sent();
+                _e.sent();
                 return [4, setPersonView(ctx, record)];
             case 7:
-                _f.sent();
-                _f.label = 8;
+                _e.sent();
+                _e.label = 8;
             case 8: return [4, getNextApprovers(ctx, record, nextStep)];
             case 9:
-                nextApprovers = _f.sent();
-                if (!(record.current_step === consts_1.Step.submitter_revisions && (nextStep === consts_1.Step.departmental_review || nextStep === consts_1.Step.personnel_review))) return [3, 23];
+                nextApprovers = _e.sent();
+                if (!((record.current_step === consts_1.Step.submitter_revisions || record.current_step === consts_1.Step.ai_review) && (nextStep === consts_1.Step.departmental_review || nextStep === consts_1.Step.personnel_review))) return [3, 26];
                 _nextApprovers = [];
-                _f.label = 10;
+                autoApproveUpdates = {};
+                _e.label = 10;
             case 10:
-                _f.trys.push([10, 18, 19, 20]);
+                _e.trys.push([10, 19, 20, 21]);
                 nextApprovers_2 = tslib_1.__values(nextApprovers), nextApprovers_2_1 = nextApprovers_2.next();
-                _f.label = 11;
+                _e.label = 11;
             case 11:
-                if (!!nextApprovers_2_1.done) return [3, 17];
+                if (!!nextApprovers_2_1.done) return [3, 18];
                 reviewer = nextApprovers_2_1.value;
                 fieldName = (0, material_1.getApproverFieldByType)(reviewer.type);
                 console.log("getApproverFieldByType", reviewer.type, fieldName);
                 if (!fieldName) {
-                    return [3, 16];
+                    return [3, 17];
                 }
                 return [4, (0, material_1.getUserReviewedAllMaterialsStatus)(ctx, record._id, fieldName)];
             case 12:
-                status = _f.sent();
+                status = _e.sent();
                 console.log("getUserReviewedAllMaterialsStatus", record._id, fieldName, status);
-                if (!(status === consts_1.ApprovalStatus.approved)) return [3, 14];
+                if (!(status === consts_1.ApprovalStatus.approved)) return [3, 15];
+                preInfo = PRE_TO_FORMAL_MAPPING[fieldName];
+                formalStatus = preInfo ? record[preInfo.statusField] : undefined;
+                if (!(preInfo && formalStatus !== true && formalStatus !== consts_1.ApprovalStatus.pass)) return [3, 14];
+                formalReviewerIds = record[preInfo.reviewerField];
+                formalUserIds = !formalReviewerIds ? [] : (Array.isArray(formalReviewerIds) ? formalReviewerIds : [formalReviewerIds]);
+                if (formalUserIds.length === 0) {
+                    throw new Error("".concat(preInfo.type, "\u6B63\u5F0F\u5BA1\u6838\u4EBA\u7F3A\u5931, \u9884\u5BA1\u81EA\u52A8\u901A\u8FC7\u540E\u65E0\u6CD5\u5206\u6D3E\u6B63\u5F0F\u5BA1\u6838, \u8BF7\u8054\u7CFB\u7BA1\u7406\u5458\u5728\u5BA1\u6838\u4EBA\u5458\u914D\u7F6E\u4E2D\u8865\u5145\u540E\u91CD\u65B0\u63D0\u4EA4"));
+                }
+                return [4, (0, agent_1.getReviewerAgentsInfo)(ctx, record.space, formalUserIds)];
+            case 13:
+                formalAgents = _e.sent();
+                formalAgents.userIds = (0, lodash_1.uniq)(formalAgents.userIds);
+                _nextApprovers.push(tslib_1.__assign(tslib_1.__assign({}, formalAgents), { type: preInfo.type }));
+                console.log("[advanceApproval] \u9884\u5BA1\u81EA\u52A8\u901A\u8FC7, \u8F6C\u5165\u6B63\u5F0F\u5BA1\u6838", recordId, fieldName, preInfo.type, formalAgents.userIds);
+                _e.label = 14;
+            case 14:
                 console.log("[advanceApproval] \u81EA\u52A8\u66F4\u65B0\u5BA1\u6279\u5355\u4E0A\u7684\u72B6\u6001\u5B57\u6BB5", recordId, (_b = {},
                     _b[fieldName] = consts_1.ApprovalStatus.approved,
                     _b));
-                return [4, ctx.getObject('pepsico_material_approval').directUpdate(recordId, (_c = {},
-                        _c[fieldName] = true,
-                        _c))];
-            case 13:
-                _f.sent();
-                return [3, 15];
-            case 14:
+                autoApproveUpdates[fieldName] = true;
+                return [3, 16];
+            case 15:
                 if (status === consts_1.ApprovalStatus.pass) {
                     console.log("[advanceApproval] \u90E8\u95E8\u5DF2\u8DF3\u8FC7\uFF0C\u4FDD\u6301bypass\u72B6\u6001", recordId, fieldName);
                 }
                 else {
                     _nextApprovers.push(reviewer);
                 }
-                _f.label = 15;
-            case 15:
-                ;
-                _f.label = 16;
+                _e.label = 16;
             case 16:
+                ;
+                _e.label = 17;
+            case 17:
                 nextApprovers_2_1 = nextApprovers_2.next();
                 return [3, 11];
-            case 17: return [3, 20];
-            case 18:
-                e_7_1 = _f.sent();
-                e_7 = { error: e_7_1 };
-                return [3, 20];
+            case 18: return [3, 21];
             case 19:
+                e_7_1 = _e.sent();
+                e_7 = { error: e_7_1 };
+                return [3, 21];
+            case 20:
                 try {
                     if (nextApprovers_2_1 && !nextApprovers_2_1.done && (_a = nextApprovers_2.return)) _a.call(nextApprovers_2);
                 }
                 finally { if (e_7) throw e_7.error; }
                 return [7];
-            case 20:
-                if (!(_nextApprovers.length > 0)) return [3, 21];
-                nextApprovers = _nextApprovers;
-                return [3, 23];
             case 21:
-                nextStep = consts_1.Step.awaiting_deployment;
-                return [4, getNextApprovers(ctx, record, nextStep)];
+                if (!(Object.keys(autoApproveUpdates).length > 0)) return [3, 23];
+                return [4, ctx.getObject('pepsico_material_approval').directUpdate(recordId, autoApproveUpdates)];
             case 22:
-                nextApprovers = _f.sent();
-                _f.label = 23;
+                _e.sent();
+                _e.label = 23;
             case 23:
+                if (!(_nextApprovers.length > 0)) return [3, 24];
+                nextApprovers = _nextApprovers;
+                return [3, 26];
+            case 24:
+                nextStep = consts_1.Step.awaiting_deployment;
+                return [4, getNextApprovers(ctx, record, nextStep)];
+            case 25:
+                nextApprovers = _e.sent();
+                _e.label = 26;
+            case 26:
                 console.log("[advanceApproval] currentStepApprovalStatus:", currentStepApprovalStatus, " nextStep:", nextStep, " nextApprovers:", nextApprovers);
                 nextApproversUserIds_1 = [];
                 nextApproversClientUserIds_1 = [];
@@ -1098,44 +1120,44 @@ var advanceApproval = function (ctx, recordId, currentStepApprovalStatus) { retu
                         }
                     }
                 };
-                if (!(record.current_step === consts_1.Step.draft)) return [3, 25];
+                if (!(record.current_step === consts_1.Step.draft)) return [3, 28];
                 setDoc.draft_submitted = new Date();
                 return [4, ctx.getObject('pepsico_material').directUpdateMany(['pepsico_material_approval', '=', record._id], {
                         draft_submitted: setDoc.draft_submitted
                     })];
-            case 24:
-                _f.sent();
-                _f.label = 25;
-            case 25:
+            case 27:
+                _e.sent();
+                _e.label = 28;
+            case 28:
                 if (record.current_step === consts_1.Step.ai_review) {
                     setDoc.ai_reviewed_date = new Date();
                 }
                 if (record.current_step === consts_1.Step.departmental_review || record.current_step === consts_1.Step.personnel_review) {
                     setDoc.re_reviewed_date = new Date();
                 }
-                if (!(nextStep === consts_1.Step.awaiting_deployment)) return [3, 27];
+                if (!(nextStep === consts_1.Step.awaiting_deployment)) return [3, 30];
                 setDoc.review_completed_date = new Date();
                 return [4, ctx.getObject('pepsico_material').directUpdateMany(['pepsico_material_approval', '=', record._id], {
                         review_completed_date: setDoc.review_completed_date
                     })];
-            case 26:
-                _f.sent();
-                _f.label = 27;
-            case 27:
+            case 29:
+                _e.sent();
+                _e.label = 30;
+            case 30:
                 if (record.current_step === consts_1.Step.awaiting_deployment) {
                     setDoc.awaiting_deployment_date = new Date();
                 }
-                if (!(record.current_step === consts_1.Step.conclusion)) return [3, 29];
+                if (!(record.current_step === consts_1.Step.conclusion)) return [3, 32];
                 setDoc.conclusion_date = new Date();
-                if (!!record.review_completed_date) return [3, 29];
+                if (!!record.review_completed_date) return [3, 32];
                 setDoc.review_completed_date = setDoc.conclusion_date;
                 return [4, ctx.getObject('pepsico_material').directUpdateMany(['pepsico_material_approval', '=', record._id], {
                         review_completed_date: setDoc.review_completed_date
                     })];
-            case 28:
-                _f.sent();
-                _f.label = 29;
-            case 29:
+            case 31:
+                _e.sent();
+                _e.label = 32;
+            case 32:
                 if (record.current_step === consts_1.Step.submitter_revisions) {
                     setDoc.submitter_revision_date = new Date();
                     console.log("[advanceApproval] \u68C0\u6D4B\u5230\u4FEE\u6539\u540E\u63D0\u4EA4\u573A\u666F, \u6807\u8BB0\u56FE\u7247\u5BF9\u6BD4\u4EFB\u52A1: ".concat(recordId));
@@ -1144,20 +1166,20 @@ var advanceApproval = function (ctx, recordId, currentStepApprovalStatus) { retu
                     setDoc.image_comparison_failed_count = 0;
                 }
                 return [4, ctx.getObject('pepsico_material_approval').update(recordId, setDoc)];
-            case 30:
-                _f.sent();
+            case 33:
+                _e.sent();
                 return [4, changeApprovalProcess(ctx, record, {
                         nextStep: nextStep,
                         nextApprovers: nextApprovers,
                         description: ""
                     })];
-            case 31:
-                _f.sent();
-                if (!(nextStep === consts_1.Step.ai_review)) return [3, 35];
-                if (!(record.current_step === consts_1.Step.submitter_revisions)) return [3, 34];
+            case 34:
+                _e.sent();
+                if (!(nextStep === consts_1.Step.ai_review)) return [3, 38];
+                if (!(record.current_step === consts_1.Step.submitter_revisions)) return [3, 37];
                 return [4, (0, pls_1.invalidateApprovalAIReviews)(ctx, recordId)];
-            case 32:
-                invalidated = _f.sent();
+            case 35:
+                invalidated = _e.sent();
                 console.log("[advanceApproval] \u4FEE\u6539\u540E\u91CD\u65B0AI\u5BA1\u6838, \u5931\u6548\u5386\u53F2AI\u610F\u89C1 ".concat(invalidated, " \u6761: ").concat(recordId));
                 return [4, (0, pls_1.writeSystemLog)(ctx, 'info', {
                         action: 'invalidate-ai-review',
@@ -1168,231 +1190,231 @@ var advanceApproval = function (ctx, recordId, currentStepApprovalStatus) { retu
                         to_step: nextStep,
                         count: invalidated
                     }, 'AI意见失效')];
-            case 33:
-                _f.sent();
-                _f.label = 34;
-            case 34:
+            case 36:
+                _e.sent();
+                _e.label = 37;
+            case 37:
                 (0, AI_1.callAIReview)(ctx, recordId).catch(function () { });
-                _f.label = 35;
-            case 35:
-                _f.trys.push([35, 77, 78, 79]);
+                _e.label = 38;
+            case 38:
+                _e.trys.push([38, 80, 81, 82]);
                 nextApprovers_3 = tslib_1.__values(nextApprovers), nextApprovers_3_1 = nextApprovers_3.next();
-                _f.label = 36;
-            case 36:
-                if (!!nextApprovers_3_1.done) return [3, 76];
+                _e.label = 39;
+            case 39:
+                if (!!nextApprovers_3_1.done) return [3, 79];
                 nextApprover = nextApprovers_3_1.value;
-                if (!(nextApprover.type === consts_1.ProcessApprovalType.CA)) return [3, 39];
+                if (!(nextApprover.type === consts_1.ProcessApprovalType.CA)) return [3, 42];
                 return [4, ctx.getObject('pepsico_material_approval').directUpdate(recordId, {
                         ca_approval_status: ''
                     })];
-            case 37:
-                _f.sent();
+            case 40:
+                _e.sent();
                 return [4, ctx.getObject('pepsico_material').directUpdateMany([['pepsico_material_approval', '=', recordId], ['ca_approval_status', '=', false]], {
                         ca_approval_status: ''
                     })];
-            case 38:
-                _f.sent();
-                _f.label = 39;
-            case 39:
-                if (!(nextApprover.type === consts_1.ProcessApprovalType.QC)) return [3, 42];
+            case 41:
+                _e.sent();
+                _e.label = 42;
+            case 42:
+                if (!(nextApprover.type === consts_1.ProcessApprovalType.QC)) return [3, 45];
                 return [4, ctx.getObject('pepsico_material_approval').directUpdate(recordId, {
                         qc_approval_status: ''
                     })];
-            case 40:
-                _f.sent();
+            case 43:
+                _e.sent();
                 return [4, ctx.getObject('pepsico_material').directUpdateMany([['pepsico_material_approval', '=', recordId], ['qc_approval_status', '=', false]], {
                         qc_approval_status: ''
                     })];
-            case 41:
-                _f.sent();
-                _f.label = 42;
-            case 42:
-                if (!(nextApprover.type === consts_1.ProcessApprovalType.Legal)) return [3, 45];
+            case 44:
+                _e.sent();
+                _e.label = 45;
+            case 45:
+                if (!(nextApprover.type === consts_1.ProcessApprovalType.Legal)) return [3, 48];
                 return [4, ctx.getObject('pepsico_material_approval').directUpdate(recordId, {
                         legal_approval_status: ''
                     })];
-            case 43:
-                _f.sent();
+            case 46:
+                _e.sent();
                 return [4, ctx.getObject('pepsico_material').directUpdateMany([['pepsico_material_approval', '=', recordId], ['legal_approval_status', '=', false]], {
                         legal_approval_status: ''
                     })];
-            case 44:
-                _f.sent();
-                _f.label = 45;
-            case 45:
-                if (!(nextApprover.type === consts_1.ProcessApprovalType.NS)) return [3, 48];
+            case 47:
+                _e.sent();
+                _e.label = 48;
+            case 48:
+                if (!(nextApprover.type === consts_1.ProcessApprovalType.NS)) return [3, 51];
                 return [4, ctx.getObject('pepsico_material_approval').directUpdate(recordId, {
                         ns_approval_status: ''
                     })];
-            case 46:
-                _f.sent();
+            case 49:
+                _e.sent();
                 return [4, ctx.getObject('pepsico_material').directUpdateMany([['pepsico_material_approval', '=', recordId], ['ns_approval_status', '=', false]], {
                         ns_approval_status: ''
                     })];
-            case 47:
-                _f.sent();
-                _f.label = 48;
-            case 48:
-                if (!(nextApprover.type === consts_1.ProcessApprovalType.SRA)) return [3, 51];
+            case 50:
+                _e.sent();
+                _e.label = 51;
+            case 51:
+                if (!(nextApprover.type === consts_1.ProcessApprovalType.SRA)) return [3, 54];
                 return [4, ctx.getObject('pepsico_material_approval').directUpdate(recordId, {
                         sra_approval_status: ''
                     })];
-            case 49:
-                _f.sent();
+            case 52:
+                _e.sent();
                 return [4, ctx.getObject('pepsico_material').directUpdateMany([['pepsico_material_approval', '=', recordId], ['sra_approval_status', '=', false]], {
                         sra_approval_status: ''
                     })];
-            case 50:
-                _f.sent();
-                _f.label = 51;
-            case 51:
-                if (!(nextApprover.type === consts_1.ProcessApprovalType.guding)) return [3, 54];
+            case 53:
+                _e.sent();
+                _e.label = 54;
+            case 54:
+                if (!(nextApprover.type === consts_1.ProcessApprovalType.guding)) return [3, 57];
                 return [4, ctx.getObject('pepsico_material_approval').directUpdate(recordId, {
                         approval_status: ''
                     })];
-            case 52:
-                _f.sent();
+            case 55:
+                _e.sent();
                 return [4, ctx.getObject('pepsico_material').directUpdateMany([['pepsico_material_approval', '=', recordId], ['approval_status', '=', false]], {
                         approval_status: ''
                     })];
-            case 53:
-                _f.sent();
-                _f.label = 54;
-            case 54:
-                if (!(nextApprover.type === consts_1.ProcessApprovalType.Kids)) return [3, 57];
+            case 56:
+                _e.sent();
+                _e.label = 57;
+            case 57:
+                if (!(nextApprover.type === consts_1.ProcessApprovalType.Kids)) return [3, 60];
                 return [4, ctx.getObject('pepsico_material_approval').directUpdate(recordId, {
                         kids_approval_status: ''
                     })];
-            case 55:
-                _f.sent();
+            case 58:
+                _e.sent();
                 return [4, ctx.getObject('pepsico_material').directUpdateMany([['pepsico_material_approval', '=', recordId], ['kids_approval_status', '=', false]], {
                         kids_approval_status: ''
                     })];
-            case 56:
-                _f.sent();
-                _f.label = 57;
-            case 57:
-                if (!(nextApprover.type === consts_1.ProcessApprovalType.PreNS)) return [3, 60];
+            case 59:
+                _e.sent();
+                _e.label = 60;
+            case 60:
+                if (!(nextApprover.type === consts_1.ProcessApprovalType.PreNS)) return [3, 63];
                 return [4, ctx.getObject('pepsico_material_approval').directUpdate(recordId, {
                         pre_ns_approval_status: ''
                     })];
-            case 58:
-                _f.sent();
+            case 61:
+                _e.sent();
                 return [4, ctx.getObject('pepsico_material').directUpdateMany([['pepsico_material_approval', '=', recordId], ['pre_ns_approval_status', '=', false]], {
                         pre_ns_approval_status: ''
                     })];
-            case 59:
-                _f.sent();
-                _f.label = 60;
-            case 60:
-                if (!(nextApprover.type === consts_1.ProcessApprovalType.PreLegal)) return [3, 63];
+            case 62:
+                _e.sent();
+                _e.label = 63;
+            case 63:
+                if (!(nextApprover.type === consts_1.ProcessApprovalType.PreLegal)) return [3, 66];
                 return [4, ctx.getObject('pepsico_material_approval').directUpdate(recordId, {
                         pre_legal_approval_status: ''
                     })];
-            case 61:
-                _f.sent();
+            case 64:
+                _e.sent();
                 return [4, ctx.getObject('pepsico_material').directUpdateMany([['pepsico_material_approval', '=', recordId], ['pre_legal_approval_status', '=', false]], {
                         pre_legal_approval_status: ''
                     })];
-            case 62:
-                _f.sent();
-                _f.label = 63;
-            case 63:
-                if (!(nextApprover.type === consts_1.ProcessApprovalType.PreSRA)) return [3, 66];
+            case 65:
+                _e.sent();
+                _e.label = 66;
+            case 66:
+                if (!(nextApprover.type === consts_1.ProcessApprovalType.PreSRA)) return [3, 69];
                 return [4, ctx.getObject('pepsico_material_approval').directUpdate(recordId, {
                         pre_sra_approval_status: ''
                     })];
-            case 64:
-                _f.sent();
+            case 67:
+                _e.sent();
                 return [4, ctx.getObject('pepsico_material').directUpdateMany([['pepsico_material_approval', '=', recordId], ['pre_sra_approval_status', '=', false]], {
                         pre_sra_approval_status: ''
                     })];
-            case 65:
-                _f.sent();
-                _f.label = 66;
-            case 66:
-                if (!(nextApprover.type === consts_1.ProcessApprovalType.PreCA)) return [3, 69];
+            case 68:
+                _e.sent();
+                _e.label = 69;
+            case 69:
+                if (!(nextApprover.type === consts_1.ProcessApprovalType.PreCA)) return [3, 72];
                 return [4, ctx.getObject('pepsico_material_approval').directUpdate(recordId, {
                         pre_ca_approval_status: ''
                     })];
-            case 67:
-                _f.sent();
+            case 70:
+                _e.sent();
                 return [4, ctx.getObject('pepsico_material').directUpdateMany([['pepsico_material_approval', '=', recordId], ['pre_ca_approval_status', '=', false]], {
                         pre_ca_approval_status: ''
                     })];
-            case 68:
-                _f.sent();
-                _f.label = 69;
-            case 69:
-                if (!(nextApprover.type === consts_1.ProcessApprovalType.PreQC)) return [3, 72];
+            case 71:
+                _e.sent();
+                _e.label = 72;
+            case 72:
+                if (!(nextApprover.type === consts_1.ProcessApprovalType.PreQC)) return [3, 75];
                 return [4, ctx.getObject('pepsico_material_approval').directUpdate(recordId, {
                         pre_qc_approval_status: ''
                     })];
-            case 70:
-                _f.sent();
+            case 73:
+                _e.sent();
                 return [4, ctx.getObject('pepsico_material').directUpdateMany([['pepsico_material_approval', '=', recordId], ['pre_qc_approval_status', '=', false]], {
                         pre_qc_approval_status: ''
                     })];
-            case 71:
-                _f.sent();
-                _f.label = 72;
-            case 72:
-                if (!(nextApprover.type === consts_1.ProcessApprovalType.Preguding)) return [3, 75];
+            case 74:
+                _e.sent();
+                _e.label = 75;
+            case 75:
+                if (!(nextApprover.type === consts_1.ProcessApprovalType.Preguding)) return [3, 78];
                 return [4, ctx.getObject('pepsico_material_approval').directUpdate(recordId, {
                         pre_approval_status: ''
                     })];
-            case 73:
-                _f.sent();
+            case 76:
+                _e.sent();
                 return [4, ctx.getObject('pepsico_material').directUpdateMany([['pepsico_material_approval', '=', recordId], ['pre_approval_status', '=', false]], {
                         pre_approval_status: ''
                     })];
-            case 74:
-                _f.sent();
-                _f.label = 75;
-            case 75:
-                nextApprovers_3_1 = nextApprovers_3.next();
-                return [3, 36];
-            case 76: return [3, 79];
             case 77:
-                e_8_1 = _f.sent();
-                e_8 = { error: e_8_1 };
-                return [3, 79];
+                _e.sent();
+                _e.label = 78;
             case 78:
+                nextApprovers_3_1 = nextApprovers_3.next();
+                return [3, 39];
+            case 79: return [3, 82];
+            case 80:
+                e_8_1 = _e.sent();
+                e_8 = { error: e_8_1 };
+                return [3, 82];
+            case 81:
                 try {
-                    if (nextApprovers_3_1 && !nextApprovers_3_1.done && (_d = nextApprovers_3.return)) _d.call(nextApprovers_3);
+                    if (nextApprovers_3_1 && !nextApprovers_3_1.done && (_c = nextApprovers_3.return)) _c.call(nextApprovers_3);
                 }
                 finally { if (e_8) throw e_8.error; }
                 return [7];
-            case 79:
-                if (!(nextStep === consts_1.Step.departmental_review || nextStep === consts_1.Step.personnel_review)) return [3, 81];
+            case 82:
+                if (!(nextStep === consts_1.Step.departmental_review || nextStep === consts_1.Step.personnel_review)) return [3, 84];
                 return [4, setPersonView(ctx, record)];
-            case 80:
-                _f.sent();
-                _f.label = 81;
-            case 81:
-                if (!(record.current_step === consts_1.Step.departmental_review || record.current_step === consts_1.Step.personnel_review)) return [3, 83];
+            case 83:
+                _e.sent();
+                _e.label = 84;
+            case 84:
+                if (!(record.current_step === consts_1.Step.departmental_review || record.current_step === consts_1.Step.personnel_review)) return [3, 86];
                 return [4, ctx.getObject('pepsico_material_approval').directUpdate(recordId, {
                         materials_remove_share_link_from_onedrive_status: 'pending'
                     })];
-            case 82:
-                _f.sent();
-                _f.label = 83;
-            case 83:
-                if (!(nextStep === consts_1.Step.awaiting_deployment)) return [3, 85];
-                return [4, pendingDeployment(ctx, recordId)];
-            case 84:
-                _f.sent();
-                _f.label = 85;
             case 85:
-                if (!(nextStep === consts_1.Step.awaiting_deployment || (nextStep === consts_1.Step.conclusion && record.current_step === consts_1.Step.ai_review))) return [3, 87];
+                _e.sent();
+                _e.label = 86;
+            case 86:
+                if (!(nextStep === consts_1.Step.awaiting_deployment)) return [3, 88];
+                return [4, pendingDeployment(ctx, recordId)];
+            case 87:
+                _e.sent();
+                _e.label = 88;
+            case 88:
+                if (!(nextStep === consts_1.Step.awaiting_deployment || (nextStep === consts_1.Step.conclusion && record.current_step === consts_1.Step.ai_review))) return [3, 90];
                 setDoc_1 = {
                     materials_download_from_onedrive_status: 'pending'
                 };
                 return [4, ctx.getObject('pepsico_material_approval').directUpdate(recordId, setDoc_1)];
-            case 86:
-                _f.sent();
-                _f.label = 87;
-            case 87:
+            case 89:
+                _e.sent();
+                _e.label = 90;
+            case 90:
                 if (currentStepApprovalStatus === consts_1.ApprovalStatus.rejected) {
                     actionLabel = '内容审批被驳回';
                 }
@@ -1404,7 +1426,7 @@ var advanceApproval = function (ctx, recordId, currentStepApprovalStatus) { retu
                     actionLabel = "\u5185\u5BB9\u5BA1\u6279\u5DF2\u901A\u8FC7\u5F85\u4E0A\u7EBF";
                 }
                 postponedUserIds_1 = [];
-                if (!(nextStep === consts_1.Step.departmental_review || nextStep === consts_1.Step.personnel_review)) return [3, 99];
+                if (!(nextStep === consts_1.Step.departmental_review || nextStep === consts_1.Step.personnel_review)) return [3, 102];
                 now = new Date();
                 visibleAfter = new Date(now.getTime() + 3 * 24 * 60 * 60 * 1000);
                 return [4, ctx.getObject('pepsico_review_postpone').directFind({
@@ -1413,25 +1435,25 @@ var advanceApproval = function (ctx, recordId, currentStepApprovalStatus) { retu
                             ['is_marker', '=', true]
                         ]
                     })];
-            case 88:
-                pastPostponeRecords = _f.sent();
-                if (!(pastPostponeRecords && pastPostponeRecords.length > 0)) return [3, 99];
+            case 91:
+                pastPostponeRecords = _e.sent();
+                if (!(pastPostponeRecords && pastPostponeRecords.length > 0)) return [3, 102];
                 postponedDepts = new Set(pastPostponeRecords.map(function (r) { return r.department_type; }));
                 _loop_1 = function (reviewer) {
                     var deptUserIds, deptMarkers, deptMarkers_1, deptMarkers_1_1, marker, e_10_1;
-                    var e_10, _g;
-                    return tslib_1.__generator(this, function (_h) {
-                        switch (_h.label) {
+                    var e_10, _f;
+                    return tslib_1.__generator(this, function (_g) {
+                        switch (_g.label) {
                             case 0:
                                 if (!postponedDepts.has(reviewer.type))
                                     return [2, "continue"];
                                 deptUserIds = reviewer.userIds || [];
                                 deptMarkers = pastPostponeRecords.filter(function (r) { return r.department_type === reviewer.type; });
-                                _h.label = 1;
+                                _g.label = 1;
                             case 1:
-                                _h.trys.push([1, 6, 7, 8]);
+                                _g.trys.push([1, 6, 7, 8]);
                                 deptMarkers_1 = (e_10 = void 0, tslib_1.__values(deptMarkers)), deptMarkers_1_1 = deptMarkers_1.next();
-                                _h.label = 2;
+                                _g.label = 2;
                             case 2:
                                 if (!!deptMarkers_1_1.done) return [3, 5];
                                 marker = deptMarkers_1_1.value;
@@ -1444,19 +1466,19 @@ var advanceApproval = function (ctx, recordId, currentStepApprovalStatus) { retu
                                         modified_by: user.userId
                                     })];
                             case 3:
-                                _h.sent();
-                                _h.label = 4;
+                                _g.sent();
+                                _g.label = 4;
                             case 4:
                                 deptMarkers_1_1 = deptMarkers_1.next();
                                 return [3, 2];
                             case 5: return [3, 8];
                             case 6:
-                                e_10_1 = _h.sent();
+                                e_10_1 = _g.sent();
                                 e_10 = { error: e_10_1 };
                                 return [3, 8];
                             case 7:
                                 try {
-                                    if (deptMarkers_1_1 && !deptMarkers_1_1.done && (_g = deptMarkers_1.return)) _g.call(deptMarkers_1);
+                                    if (deptMarkers_1_1 && !deptMarkers_1_1.done && (_f = deptMarkers_1.return)) _f.call(deptMarkers_1);
                                 }
                                 finally { if (e_10) throw e_10.error; }
                                 return [7];
@@ -1466,37 +1488,37 @@ var advanceApproval = function (ctx, recordId, currentStepApprovalStatus) { retu
                         }
                     });
                 };
-                _f.label = 89;
-            case 89:
-                _f.trys.push([89, 94, 95, 96]);
+                _e.label = 92;
+            case 92:
+                _e.trys.push([92, 97, 98, 99]);
                 nextApprovers_4 = tslib_1.__values(nextApprovers), nextApprovers_4_1 = nextApprovers_4.next();
-                _f.label = 90;
-            case 90:
-                if (!!nextApprovers_4_1.done) return [3, 93];
+                _e.label = 93;
+            case 93:
+                if (!!nextApprovers_4_1.done) return [3, 96];
                 reviewer = nextApprovers_4_1.value;
                 return [5, _loop_1(reviewer)];
-            case 91:
-                _f.sent();
-                _f.label = 92;
-            case 92:
-                nextApprovers_4_1 = nextApprovers_4.next();
-                return [3, 90];
-            case 93: return [3, 96];
             case 94:
-                e_9_1 = _f.sent();
-                e_9 = { error: e_9_1 };
-                return [3, 96];
+                _e.sent();
+                _e.label = 95;
             case 95:
+                nextApprovers_4_1 = nextApprovers_4.next();
+                return [3, 93];
+            case 96: return [3, 99];
+            case 97:
+                e_9_1 = _e.sent();
+                e_9 = { error: e_9_1 };
+                return [3, 99];
+            case 98:
                 try {
-                    if (nextApprovers_4_1 && !nextApprovers_4_1.done && (_e = nextApprovers_4.return)) _e.call(nextApprovers_4);
+                    if (nextApprovers_4_1 && !nextApprovers_4_1.done && (_d = nextApprovers_4.return)) _d.call(nextApprovers_4);
                 }
                 finally { if (e_9) throw e_9.error; }
                 return [7];
-            case 96:
-                if (!(postponedUserIds_1.length > 0)) return [3, 99];
+            case 99:
+                if (!(postponedUserIds_1.length > 0)) return [3, 102];
                 return [4, ctx.getObject('pepsico_material_approval').findOne(recordId)];
-            case 97:
-                currentRecord = _f.sent();
+            case 100:
+                currentRecord = _e.sent();
                 currentPostponed = currentRecord.review_postponed_users || [];
                 newPostponed = (0, lodash_1.compact)((0, lodash_1.uniq)((0, lodash_1.concat)(currentPostponed, postponedUserIds_1)));
                 currentMarkerUsers = currentRecord.postpone_marker_users || [];
@@ -1505,44 +1527,44 @@ var advanceApproval = function (ctx, recordId, currentStepApprovalStatus) { retu
                         review_postponed_users: newPostponed,
                         postpone_marker_users: newMarkerUsers
                     })];
-            case 98:
-                _f.sent();
+            case 101:
+                _e.sent();
                 console.log("[advanceApproval] \u81EA\u52A8\u5EF6\u540E\u5BA1\u6838\u4EBA: ".concat(postponedUserIds_1, ", visibleAfter: ").concat(visibleAfter));
-                _f.label = 99;
-            case 99:
+                _e.label = 102;
+            case 102:
                 notifyUserIds = postponedUserIds_1.length > 0
                     ? nextApproversUserIds_1.filter(function (id) { return !postponedUserIds_1.includes(id); })
                     : nextApproversUserIds_1;
                 return [4, (0, notification_1.sendNotifications)(ctx, record, notifyUserIds, actionLabel)];
-            case 100:
-                _f.sent();
-                if (!(actionLabel === '内容审批被驳回' || actionLabel === '内容审批已通过待上线')) return [3, 102];
+            case 103:
+                _e.sent();
+                if (!(actionLabel === '内容审批被驳回' || actionLabel === '内容审批已通过待上线')) return [3, 105];
                 return [4, (0, approval_cc_1.notifyApprovalCcUsers)(ctx, record, actionLabel, notification_1.sendCcNotifications, notifyUserIds)];
-            case 101:
-                _f.sent();
-                _f.label = 102;
-            case 102:
-                if (!(nextStep === consts_1.Step.awaiting_deployment)) return [3, 104];
+            case 104:
+                _e.sent();
+                _e.label = 105;
+            case 105:
+                if (!(nextStep === consts_1.Step.awaiting_deployment)) return [3, 107];
                 initiator = record.owner;
                 materialOwner = record.material_owner_id;
-                if (!(initiator && materialOwner && initiator !== materialOwner)) return [3, 104];
+                if (!(initiator && materialOwner && initiator !== materialOwner)) return [3, 107];
                 console.log("[advanceApproval] \u901A\u77E5\u53D1\u8D77\u4EBA\u5BA1\u6838\u5B8C\u6210: initiator=".concat(initiator, ", material_owner=").concat(materialOwner));
                 return [4, (0, notification_1.sendNotifications)(ctx, record, [initiator], '审核完成')];
-            case 103:
-                _f.sent();
-                _f.label = 104;
-            case 104:
-                if (!(nextStep === consts_1.Step.conclusion)) return [3, 106];
-                return [4, (0, approval_cc_1.notifyApprovalCcUsers)(ctx, record, '内容审批已完成', notification_1.sendCcNotifications, notifyUserIds)];
-            case 105:
-                _f.sent();
-                _f.label = 106;
-            case 106: return [2, {}];
+            case 106:
+                _e.sent();
+                _e.label = 107;
             case 107:
-                error_1 = _f.sent();
+                if (!(nextStep === consts_1.Step.conclusion)) return [3, 109];
+                return [4, (0, approval_cc_1.notifyApprovalCcUsers)(ctx, record, '内容审批已完成', notification_1.sendCcNotifications, notifyUserIds)];
+            case 108:
+                _e.sent();
+                _e.label = 109;
+            case 109: return [2, {}];
+            case 110:
+                error_1 = _e.sent();
                 console.error('[advanceApproval] Error:', error_1.message, error_1.stack);
                 throw error_1;
-            case 108: return [2];
+            case 111: return [2];
         }
     });
 }); };
@@ -1726,26 +1748,37 @@ var approvalContent = function (ctx, recordId, _a) {
                     return [4, ctx.getObject('pepsico_material_approval').findOne(recordId)];
                 case 1:
                     approvalOld = _c.sent();
-                    if (approvalOld.current_step != consts_1.Step.draft && !(0, lodash_1.includes)(approvalOld.person_pending_approve, user.userId)) {
-                        return [2, {}];
-                    }
+                    if (!(approvalOld.current_step != consts_1.Step.draft && !(0, lodash_1.includes)(approvalOld.person_pending_approve, user.userId))) return [3, 3];
+                    return [4, (0, pls_1.writeSystemLog)(ctx, 'warn', {
+                            action: 'approve-denied-not-pending',
+                            id: recordId,
+                            approval_name: approvalOld.name,
+                            operator: user && user.userId,
+                            approve_field: approveField,
+                            current_step: approvalOld.current_step,
+                            person_pending_approve: approvalOld.person_pending_approve
+                        }, '核准被拒绝: 用户不在待办名单')];
+                case 2:
+                    _c.sent();
+                    return [2, {}];
+                case 3:
                     fieldStatus = materialStatus === consts_1.ApprovalStatus.pass ? consts_1.ApprovalStatus.pass : true;
                     return [4, updateApproveFieldStatus(ctx, recordId, approveField, fieldStatus)];
-                case 2:
+                case 4:
                     _c.sent();
                     return [4, ctx.getObject('pepsico_material_approval').findOne(recordId)];
-                case 3:
+                case 5:
                     approvalNew = _c.sent();
                     currentStepApprovalStatus = fieldStatus === true ? consts_1.ApprovalStatus.approved : fieldStatus;
                     return [4, updateUserStepStatus(ctx, approvalNew, { approvalStatus: currentStepApprovalStatus, approveField: approveField })];
-                case 4:
+                case 6:
                     _c.sent();
-                    if (!(PRE_TO_FORMAL_MAPPING[approveField] && (fieldStatus === true || fieldStatus === consts_1.ApprovalStatus.pass))) return [3, 6];
-                    return [4, addFormalReviewerAfterPreApproval(ctx, recordId, approveField, approvalNew)];
-                case 5:
+                    if (!(PRE_TO_FORMAL_MAPPING[approveField] && (fieldStatus === true || fieldStatus === consts_1.ApprovalStatus.pass))) return [3, 8];
+                    return [4, (0, exports.addFormalReviewerAfterPreApproval)(ctx, recordId, approveField, approvalNew)];
+                case 7:
                     _c.sent();
-                    _c.label = 6;
-                case 6:
+                    _c.label = 8;
+                case 8:
                     isPositive = function (status) { return status === true || status === consts_1.ApprovalStatus.approved || status === consts_1.ApprovalStatus.pass; };
                     isPass = function (status) { return status === consts_1.ApprovalStatus.pass; };
                     if (approvalNew.current_step === consts_1.Step.departmental_review) {
@@ -1790,7 +1823,7 @@ var approvalContent = function (ctx, recordId, _a) {
                     }
                     console.log("[approvalContent] \u63A8\u8FDB\u5BA1\u6279\u8FDB\u5EA6,\u53C2\u6570\u4E3A \u5BA1\u6279\u5355: ".concat(recordId, " \u5F53\u524D\u6B65\u9AA4: ").concat(approvalNew.current_step, " \u5BA1\u6279\u7ED3\u679C\u4E3A: ").concat(currentStepApprovalStatus));
                     return [4, (0, exports.advanceApproval)(ctx, recordId, currentStepApprovalStatus)];
-                case 7:
+                case 9:
                     _c.sent();
                     return [2, {}];
             }
@@ -1809,18 +1842,28 @@ var rejectContent = function (ctx, recordId, _a) {
                     return [4, ctx.getObject('pepsico_material_approval').findOne(recordId)];
                 case 1:
                     approvalOld = _b.sent();
-                    if (approvalOld.current_step != consts_1.Step.draft && !(0, lodash_1.includes)(approvalOld.person_pending_approve, user.userId)) {
-                        return [2, {}];
-                    }
-                    return [4, updateApproveFieldStatus(ctx, recordId, approveField, false)];
+                    if (!(approvalOld.current_step != consts_1.Step.draft && !(0, lodash_1.includes)(approvalOld.person_pending_approve, user.userId))) return [3, 3];
+                    return [4, (0, pls_1.writeSystemLog)(ctx, 'warn', {
+                            action: 'reject-denied-not-pending',
+                            id: recordId,
+                            approval_name: approvalOld.name,
+                            operator: user && user.userId,
+                            approve_field: approveField,
+                            current_step: approvalOld.current_step,
+                            person_pending_approve: approvalOld.person_pending_approve
+                        }, '驳回被拒绝: 用户不在待办名单')];
                 case 2:
+                    _b.sent();
+                    return [2, {}];
+                case 3: return [4, updateApproveFieldStatus(ctx, recordId, approveField, false)];
+                case 4:
                     _b.sent();
                     return [4, ctx.getObject('pepsico_material_approval').findOne(recordId)];
-                case 3:
+                case 5:
                     approvalNew = _b.sent();
                     currentStepApprovalStatus = consts_1.ApprovalStatus.rejected;
                     return [4, updateUserStepStatus(ctx, approvalNew, { approvalStatus: consts_1.ApprovalStatus.rejected, approveField: approveField })];
-                case 4:
+                case 6:
                     _b.sent();
                     isPositive = function (status) { return status === true || status === consts_1.ApprovalStatus.approved || status === consts_1.ApprovalStatus.pass; };
                     if (approvalNew.current_step === consts_1.Step.departmental_review) {
@@ -1846,7 +1889,7 @@ var rejectContent = function (ctx, recordId, _a) {
                     }
                     console.log("[rejectContent] \u63A8\u8FDB\u5BA1\u6279\u8FDB\u5EA6,\u53C2\u6570\u4E3A \u5BA1\u6279\u5355: ".concat(recordId, " \u5F53\u524D\u6B65\u9AA4: ").concat(approvalNew.current_step, " \u5BA1\u6279\u7ED3\u679C\u4E3A: ").concat(currentStepApprovalStatus));
                     return [4, (0, exports.advanceApproval)(ctx, recordId, currentStepApprovalStatus)];
-                case 5:
+                case 7:
                     _b.sent();
                     return [2, {}];
             }