From e88cd707364a2c502bcc6a8b97e63c2b89b88217 Mon Sep 17 00:00:00 2001 From: rislai <risheng.lai@capgemini.com> Date: 星期三, 31 七月 2024 17:40:56 +0800 Subject: [PATCH] Merge branch 'dev' of http://47.101.211.7:10101/r/VWED into dev --- _Main/BL/Type_LibCal_ExplicitTimeInterval/StaticMethod_Delete.qbl | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/_Main/BL/Type_LibCal_ExplicitTimeInterval/StaticMethod_Delete.qbl b/_Main/BL/Type_LibCal_ExplicitTimeInterval/StaticMethod_Delete.qbl index b90eafb..a9cb34f 100644 --- a/_Main/BL/Type_LibCal_ExplicitTimeInterval/StaticMethod_Delete.qbl +++ b/_Main/BL/Type_LibCal_ExplicitTimeInterval/StaticMethod_Delete.qbl @@ -18,9 +18,13 @@ } } if( not isnull( leadingeti ) ){ - eti.Delete(); + subscription := selectobject( eti, Participation.Event.LeadingParticipation.Subscription, subscription, subscription.Calendar().CalendarID() = eti.Participation().Calendar().CalendarID() ); + if( subscription.ExplicitTimeInterval( relsize ) = 1 ){ + subscription.Delete(); + }else{ + eti.Delete(); + } } - } *] } -- Gitblit v1.9.3