!8767 !8766 添加功能

Merge pull request !8767 from 李鹏宇/dev

soong_workflow/views/soong_workflow_record.xml

@@ -236,7 +236,7 @@
             <field name="arch" type="xml">
                 <tree string="流程查询" action="open_record" type="object"
                       delete="false"
-                      create="false" default_order="write_date2 desc, id desc" expand="1" limit="10">
+                      create="false" default_order="display_end_time" expand="1" limit="10">
                     <header>
                         <button name="admin_end" type="object" string="管理员强制结束" class="oe_highlight"
                                 groups="soong_workflow.group_soong_workflow_manager"/>

yuthon_hr_attendance/models/hr_attendance.py

@@ -280,6 +280,9 @@ class HrAttendance(models.Model):
         for rec in attendance_records:
             emp = rec.employee_id
             emp_id = emp.id
+            resource_user_ids = emp.resource_calendar_id.resource_user_ids.ids if emp.resource_calendar_id else []
+            if emp_id in resource_user_ids:
+                continue
             if emp_id not in employee_abnormal:
                 employee_abnormal[emp_id] = {'abnormal_list': [], 'employee': emp}