|
|
@@ -1052,8 +1052,8 @@ class SmartSceneView(View):
|
|
|
effective_time_id = smart_scene['effective_time_id']
|
|
|
effective_time_md = EffectiveTime.objects.get(id=effective_time_id)
|
|
|
# 判断时间是否在已设置过的时间范围之内
|
|
|
- # (新)结束时间大于等于(旧)开始时间,或开始时间小于等于结束时间
|
|
|
- if end_time >= effective_time_md.start_time or start_time <= effective_time_md.end_time:
|
|
|
+ if effective_time_md.start_time <= start_time <= effective_time_md.end_time or \
|
|
|
+ effective_time_md.start_time <= end_time <= effective_time_md.end_time:
|
|
|
return True
|
|
|
return False
|
|
|
|
