From ef4c8153c2beb28b4fff43a55da2f37435c05182 Mon Sep 17 00:00:00 2001 From: root Date: Sun, 5 Jul 2026 23:03:50 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=88=A0=E9=99=A4=E5=B7=A5?= =?UTF-8?q?=E5=8D=95=E6=89=80=E6=9C=89=E5=85=B3=E8=81=94=E5=8F=B7=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/admin/model/split/Ticket.php | 2 +- application/common/service/SplitTicketRuleService.php | 4 +--- patches/application/admin/model/split/Ticket.php | 2 +- patches/application/common/service/SplitTicketRuleService.php | 4 +--- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/application/admin/model/split/Ticket.php b/application/admin/model/split/Ticket.php index 5e890d4..a7782f3 100755 --- a/application/admin/model/split/Ticket.php +++ b/application/admin/model/split/Ticket.php @@ -19,7 +19,7 @@ class Ticket extends Model protected static function init(): void { - // 删除工单时：释放同步锁，并物理删除同步导入的号码（manual_manage=0） + // 删除工单时：释放同步锁，并物理删除该工单关联的全部号码 self::beforeDelete(function (self $ticket): void { (new SplitTicketSyncLockService())->release((int) $ticket['id']); (new SplitTicketRuleService())->deleteSyncedNumbersForTicket($ticket); diff --git a/application/common/service/SplitTicketRuleService.php b/application/common/service/SplitTicketRuleService.php index 9c458e0..3af1b97 100755 --- a/application/common/service/SplitTicketRuleService.php +++ b/application/common/service/SplitTicketRuleService.php @@ -54,10 +54,9 @@ class SplitTicketRuleService } /** - * 工单物理删除时，移除该工单同步导入的号码（manual_manage=0） + * 工单物理删除时，移除该工单关联的全部号码（含 manual_manage=1） * * 关联键与 SplitTicketNumberSyncService 一致：admin_id + split_link_id + ticket_name - * manual_manage=1 的手动管理号码保留 * * @return int 删除行数 */ @@ -72,7 +71,6 @@ class SplitTicketRuleService return Number::where('admin_id', (int) $ticket['admin_id']) ->where('split_link_id', $linkId) ->where('ticket_name', $ticketName) - ->where('manual_manage', 0) ->delete(); } diff --git a/patches/application/admin/model/split/Ticket.php b/patches/application/admin/model/split/Ticket.php index 5e890d4..a7782f3 100755 --- a/patches/application/admin/model/split/Ticket.php +++ b/patches/application/admin/model/split/Ticket.php @@ -19,7 +19,7 @@ class Ticket extends Model protected static function init(): void { - // 删除工单时：释放同步锁，并物理删除同步导入的号码（manual_manage=0） + // 删除工单时：释放同步锁，并物理删除该工单关联的全部号码 self::beforeDelete(function (self $ticket): void { (new SplitTicketSyncLockService())->release((int) $ticket['id']); (new SplitTicketRuleService())->deleteSyncedNumbersForTicket($ticket); diff --git a/patches/application/common/service/SplitTicketRuleService.php b/patches/application/common/service/SplitTicketRuleService.php index 9c458e0..3af1b97 100755 --- a/patches/application/common/service/SplitTicketRuleService.php +++ b/patches/application/common/service/SplitTicketRuleService.php @@ -54,10 +54,9 @@ class SplitTicketRuleService } /** - * 工单物理删除时，移除该工单同步导入的号码（manual_manage=0） + * 工单物理删除时，移除该工单关联的全部号码（含 manual_manage=1） * * 关联键与 SplitTicketNumberSyncService 一致：admin_id + split_link_id + ticket_name - * manual_manage=1 的手动管理号码保留 * * @return int 删除行数 */ @@ -72,7 +71,6 @@ class SplitTicketRuleService return Number::where('admin_id', (int) $ticket['admin_id']) ->where('split_link_id', $linkId) ->where('ticket_name', $ticketName) - ->where('manual_manage', 0) ->delete(); }