From 46dab2c95c19de4fecc61d6af29efc89ca2fc70b Mon Sep 17 00:00:00 2001 From: renshen <1005457301@qq.com> Date: Fri, 6 Nov 2026 10:23:38 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=91=A8=E7=94=9F=E8=BE=B0=E9=80=80?= =?UTF-8?q?=E5=87=BA=E6=97=A5=E5=BF=97=E6=89=A3=E5=88=86=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/dingtalk.php | 6 +++++- .../EcommerceFinance/DingWorklogPenaltyCalculatorTest.php | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/config/dingtalk.php b/config/dingtalk.php index f99161f8..11c08c9c 100644 --- a/config/dingtalk.php +++ b/config/dingtalk.php @@ -57,9 +57,13 @@ return [ ))), 'display_name' => env('DINGTALK_WORKLOG_DISPLAY_NAME', '财务日报 / 日志'), 'penalty_start_date' => env('DINGTALK_WORKLOG_PENALTY_START_DATE', '2026-11-04'), + // 江陵不参与扣分;周生辰待离职,按负责人要求从扣分明细移除。 'penalty_excluded_user_ids' => array_values(array_filter(array_map( 'trim', - explode(',', (string) env('DINGTALK_WORKLOG_PENALTY_EXCLUDED_USER_IDS', '02591267217229')), + explode(',', (string) env( + 'DINGTALK_WORKLOG_PENALTY_EXCLUDED_USER_IDS', + '02591267217229,17097754648162977', + )), ))), 'userid' => env('DINGTALK_WORKLOG_USERID'), 'lookback_days' => (int) env('DINGTALK_WORKLOG_LOOKBACK_DAYS', 35), diff --git a/tests/Unit/EcommerceFinance/DingWorklogPenaltyCalculatorTest.php b/tests/Unit/EcommerceFinance/DingWorklogPenaltyCalculatorTest.php index af49e29d..5a46483a 100644 --- a/tests/Unit/EcommerceFinance/DingWorklogPenaltyCalculatorTest.php +++ b/tests/Unit/EcommerceFinance/DingWorklogPenaltyCalculatorTest.php @@ -105,7 +105,10 @@ class DingWorklogPenaltyCalculatorTest extends TestCase { config([ 'dingtalk.worklog.penalty_start_date' => '2026-11-04', - 'dingtalk.worklog.penalty_excluded_user_ids' => ['02591267217229'], + 'dingtalk.worklog.penalty_excluded_user_ids' => [ + '02591267217229', + '17097754648162977', + ], 'app.timezone' => 'Asia/Shanghai', ]); $repository = Mockery::mock(DingWorklogMirrorRepository::class); @@ -115,6 +118,7 @@ class DingWorklogPenaltyCalculatorTest extends TestCase $roster = Mockery::mock(FinanceRoster::class); $roster->shouldReceive('cachedFinanceMembers')->once()->andReturn([ ['userid' => '02591267217229', 'name' => '江陵'], + ['userid' => '17097754648162977', 'name' => '周生辰'], ['userid' => 'qiuxiang', 'name' => '秋香'], ]); $attendance = Mockery::mock(DingAttendanceMirrorRepository::class);