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(); }