From ecd077cdea5436d7542db704500b38bba76c5cfc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E5=AE=87?=
 <9664676+pengyuthon@user.noreply.gitee.com>
Date: Tue, 21 Apr 2026 18:34:01 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yuthon_issue/models/inherit_room_booking.py     | 12 ++++++++++++
 yuthon_issue/views/inherit_room_booking.xml     |  1 +
 yuthon_will_task/models/inherit_room_booking.py | 13 ++++++++-----
 3 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/yuthon_issue/models/inherit_room_booking.py b/yuthon_issue/models/inherit_room_booking.py
index d256f7b32..c6876e579 100644
--- a/yuthon_issue/models/inherit_room_booking.py
+++ b/yuthon_issue/models/inherit_room_booking.py
@@ -14,6 +14,18 @@ class RoomBooking(models.Model):
     is_company = fields.Boolean(string="本公司", default=True, compute='_compute_is_company',
                                 search='_search_part_of_company')
 
+    def copy_attendees_from_previous_line(self):
+        for booking in self:
+            if not booking.issue_meeting_line_ids:
+                continue
+            lines = booking.issue_meeting_line_ids.sorted('sequence')
+            for i in range(1, len(lines)):
+                prev_line = lines[i - 1]
+                current_line = lines[i]
+                current_line.write({
+                    'attendees_ids': [(6, 0, prev_line.attendees_ids.ids)]
+                })
+
     @api.onchange('meeting_type_id')
     def _onchange_meeting_type_id(self):
         if self.meeting_type_id:
diff --git a/yuthon_issue/views/inherit_room_booking.xml b/yuthon_issue/views/inherit_room_booking.xml
index 36b680358..811c9b07a 100644
--- a/yuthon_issue/views/inherit_room_booking.xml
+++ b/yuthon_issue/views/inherit_room_booking.xml
@@ -20,6 +20,7 @@
 
             <xpath expr="//page[@name='sign']" position="before">
                 <page string="关联议题" invisible="not is_issue">
+                    <button name="copy_attendees_from_previous_line" string="复制" type="object" class="btn-primary"/>
                     <field name="issue_meeting_line_ids">
                         <tree editable="bottom">
                             <button name="open_record" type="object" string="详情" class="oe_highlight"/>
diff --git a/yuthon_will_task/models/inherit_room_booking.py b/yuthon_will_task/models/inherit_room_booking.py
index 20545902d..514e33e04 100644
--- a/yuthon_will_task/models/inherit_room_booking.py
+++ b/yuthon_will_task/models/inherit_room_booking.py
@@ -28,6 +28,7 @@ class InheritRoomBooking(models.Model):
         new_record = super(InheritRoomBooking, self).create(vals)
         employee_list = []
         booking = new_record
+
         # ① 组织者
         if booking.organizer_id:
             employee_list.append(booking.organizer_id.employee_id.id)
@@ -54,7 +55,7 @@ class InheritRoomBooking(models.Model):
                 role_employees = self.env['hr.employee'].search([
                     '|',
                     ('user_role_id', 'in', role_group_roles.ids),
-                    ('user_role_ids', 'in', role_group_roles.ids)
+                    ('user_ids', 'in', role_group_roles.ids)
                 ])
                 employee_list.extend(role_employees.ids)
         # ⑦ 主持人
@@ -63,6 +64,7 @@ class InheritRoomBooking(models.Model):
 
         # 去重
         employee_list = list(set(employee_list))
+
         def get_hour_selection(datetime_obj):
             if not datetime_obj:
                 return None
@@ -92,22 +94,23 @@ class InheritRoomBooking(models.Model):
                     return f"{hour % 24}.75"
 
         start_datetime = new_record.start_datetime
-        start_date = start_datetime.date()
+        start_date = start_datetime.date() if start_datetime else False
         request_hour_from = get_hour_selection(new_record.start_datetime)
         request_hour_to = get_hour_selection(new_record.stop_datetime)
 
-        # ====================== 创建任务 ======================
+        task_time_vals = vals.get('task_time_ids', [])
         task_id = self.env['yuthon.will.task'].sudo().create({
             'name': new_record.name,
             'employee_ids': [(6, 0, employee_list)],
-            'task_time_ids': [(6, 0, new_record.task_time_ids.ids)] if new_record.task_time_ids else [],
+            'task_time_ids': task_time_vals,
             'start_date': start_date,
             'request_hour_from': request_hour_from,
             'request_hour_to': request_hour_to,
-            'address': new_record.room_id.name,
+            'address': new_record.room_id.name if new_record.room_id else '',
             'room_booking_id': new_record.id,
             'task_type': 'meet',
             'task_state': 'will',
         })
+
         task_id._onchange_employee_ids()
         return new_record