OAFLOW1 支持负责人本人报销兜底审批
这个提交包含在:
@@ -191,7 +191,12 @@ function buildRoleFindings(employees, pendingAssignedRows, pendingRoleRows, appr
|
||||
})),
|
||||
approvalRulesUseAdmin: approvalRuleRows.map((row) => ({
|
||||
ruleName: row.name,
|
||||
roles: [row.level1_role, row.level2_role, row.level3_role].filter(Boolean),
|
||||
roles: [
|
||||
row.level1_role,
|
||||
row.level2_role,
|
||||
row.level3_role,
|
||||
row.owner_self_fallback_role,
|
||||
].filter(Boolean),
|
||||
})),
|
||||
};
|
||||
}
|
||||
@@ -328,13 +333,14 @@ async function queryAll(client) {
|
||||
`);
|
||||
|
||||
const approvalRuleResult = await client.query(`
|
||||
SELECT name, level1_role::text, level2_role::text, level3_role::text
|
||||
SELECT name, level1_role::text, level2_role::text, level3_role::text, owner_self_fallback_role::text
|
||||
FROM approval_rules
|
||||
WHERE enabled = true
|
||||
AND (
|
||||
level1_role = 'admin'
|
||||
OR level2_role = 'admin'
|
||||
OR level3_role = 'admin'
|
||||
OR owner_self_fallback_role = 'admin'
|
||||
)
|
||||
ORDER BY priority ASC, name ASC
|
||||
`);
|
||||
|
||||
@@ -56,6 +56,7 @@ const DEFAULT_APPROVAL_RULES = [
|
||||
level1_role: "manager",
|
||||
level2_role: "finance",
|
||||
level3_role: null,
|
||||
owner_self_fallback_role: "finance_mgr",
|
||||
priority: 10,
|
||||
},
|
||||
{
|
||||
@@ -65,6 +66,7 @@ const DEFAULT_APPROVAL_RULES = [
|
||||
level1_role: "manager",
|
||||
level2_role: "finance_mgr",
|
||||
level3_role: null,
|
||||
owner_self_fallback_role: "finance_mgr",
|
||||
priority: 20,
|
||||
},
|
||||
{
|
||||
@@ -74,6 +76,7 @@ const DEFAULT_APPROVAL_RULES = [
|
||||
level1_role: "manager",
|
||||
level2_role: "ceo",
|
||||
level3_role: "finance_mgr",
|
||||
owner_self_fallback_role: "finance_mgr",
|
||||
priority: 30,
|
||||
},
|
||||
];
|
||||
|
||||
在新工单中引用
屏蔽一个用户