!7290 !7289 添加功能

Merge pull request !7290 from 李鹏宇/dev

yuthon_will_task/models/inherit_room_booking.py

@@ -5,19 +5,20 @@ from datetime import datetime, timedelta, date
 class InheritRoomBooking(models.Model):
     _inherit = 'room.booking'
 
-
     def get_no_read_count(self):
-        today = date.today() + timedelta(hours=8)
+        today = date.today()+ timedelta(hours=8)
         today_start = datetime.combine(today, datetime.min.time())
         today_end = datetime.combine(today, datetime.max.time())
+        current_datetime = datetime.now() + timedelta(hours=8)
         domain = [
-            ('company_id', '=', self.env.user.company_id.id),
             ('start_datetime', '>=', today_start),
-            ('start_datetime', '<=', today_end)
+            ('start_datetime', '<=', today_end),
+            '|',
+            ('end_datetime', '=', False),
+            ('end_datetime', '>', current_datetime)
         ]
         return self.search_count(domain)
 
-
     @api.model
     def create(self, vals):
         task_time_ids = self.env['yuthon.task.time'].search([('name', '=', '30分钟')])