From a1176b1042b5c0a4983a92f912ea1c452cf3b8e8 Mon Sep 17 00:00:00 2001 From: root Date: Thu, 26 Feb 2026 17:30:25 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E7=A7=BB=E9=99=A4=E7=A1=AC=E7=BC=96?= =?UTF-8?q?=E7=A0=81=EF=BC=8C=E4=BD=BF=E7=94=A8=E6=95=B0=E6=8D=AE=E5=BA=93?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=AE=A1=E6=89=B9=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 数据库已配置审批节点:陈兰 (id=27) - 数据库已配置抄送节点:陈标 (id=29) - 移除硬编码的 getDefaultApproversFromConfig() 方法 - 代码从数据库读取配置 Co-Authored-By: Claude Opus 4.6 --- backend/app/service/BusinessTripService.php | 64 +-------------------- 1 file changed, 3 insertions(+), 61 deletions(-) diff --git a/backend/app/service/BusinessTripService.php b/backend/app/service/BusinessTripService.php index 3292e24..19e8229 100644 --- a/backend/app/service/BusinessTripService.php +++ b/backend/app/service/BusinessTripService.php @@ -718,7 +718,7 @@ class BusinessTripService /** * 获取默认审批人和抄送人 - * 从审批流程配置表中获取,如果没有配置则返回默认值 + * 从审批流程配置表中获取 */ public function getDefaultApprovers(int $userId): array { @@ -728,11 +728,9 @@ class BusinessTripService ->first(); if (!$flow) { - // 没有配置流程时,返回默认审批人和抄送人 - $defaultApprovers = $this->getDefaultApproversFromConfig(); return [ - 'approvers' => $defaultApprovers['approvers'], - 'cc_users' => $defaultApprovers['cc_users'], + 'approvers' => [], + 'cc_users' => [], ]; } @@ -783,60 +781,4 @@ class BusinessTripService 'cc_users' => $ccUsers, ]; } - - /** - * 获取默认配置的审批人和抄送人 - * 当没有配置审批流程时使用 - */ - private function getDefaultApproversFromConfig(): array - { - // 默认审批人:陈兰 (id=27) - // 默认抄送人:陈标 (id=29) - $defaultApproverIds = [27]; - $defaultCcUserIds = [29]; - - $approvers = []; - $ccUsers = []; - - // 获取审批人信息 - if (!empty($defaultApproverIds)) { - $users = User::whereIn('id', $defaultApproverIds) - ->where('status', 1) - ->get(); - - foreach ($defaultApproverIds as $userId) { - $user = $users->firstWhere('id', $userId); - if ($user) { - $approvers[] = [ - 'id' => $user->id, - 'name' => $user->name, - 'avatar' => $user->avatar, - ]; - } - } - } - - // 获取抄送人信息 - if (!empty($defaultCcUserIds)) { - $users = User::whereIn('id', $defaultCcUserIds) - ->where('status', 1) - ->get(); - - foreach ($defaultCcUserIds as $userId) { - $user = $users->firstWhere('id', $userId); - if ($user) { - $ccUsers[] = [ - 'id' => $user->id, - 'name' => $user->name, - 'avatar' => $user->avatar, - ]; - } - } - } - - return [ - 'approvers' => $approvers, - 'cc_users' => $ccUsers, - ]; - } }