|
@@ -173,7 +173,7 @@ class EquipmentInfoService:
|
|
|
eventTypeList = list(set(eventTypeList))
|
|
eventTypeList = list(set(eventTypeList))
|
|
|
tags = cls.get_event_tag(event_type)
|
|
tags = cls.get_event_tag(event_type)
|
|
|
if eventTypeList:
|
|
if eventTypeList:
|
|
|
- qs = qs.filter(Q(event_type__in=eventTypeList) | Q(event_tag__regex=tags))
|
|
|
|
|
|
|
+ qs = qs.filter(Q(event_type__in=eventTypeList, event_tag='') | Q(event_tag__regex=tags))
|
|
|
elif tags:
|
|
elif tags:
|
|
|
qs = qs.filter(event_tag__regex=tags)
|
|
qs = qs.filter(event_tag__regex=tags)
|
|
|
if start_time and end_time:
|
|
if start_time and end_time:
|
