diff --git a/yuthon_notice/models/yuthon_notice.py b/yuthon_notice/models/yuthon_notice.py index 2d5cf4b96..3c3ceccd6 100644 --- a/yuthon_notice/models/yuthon_notice.py +++ b/yuthon_notice/models/yuthon_notice.py @@ -211,10 +211,10 @@ class YuthonNotice(models.Model): ) if not employee: continue - url = f'https://phone.thtzjt.com/phone/Notice/110?employee_id={employee.id}' + url = f'https://phone.thtzjt.com/phone/Notice/{self.id}?employee_id={employee.id}' result_data = self.sudo().env["wecom.apps"].sync_send_message_textcard( category='notice', - user_id=employee.wecom_userid, + user_id='18562027762', title="通知公告", description=self.name + '发布人:' + self.users_id.name, url=url, diff --git a/yuthon_will_task/models/inherit_room_booking.py b/yuthon_will_task/models/inherit_room_booking.py index d746f52e2..df3ba09ec 100644 --- a/yuthon_will_task/models/inherit_room_booking.py +++ b/yuthon_will_task/models/inherit_room_booking.py @@ -25,28 +25,19 @@ class InheritRoomBooking(models.Model): @api.model def create(self, vals): - task_time_ids = self.env['yuthon.task.time'].search([('name', '=', '30分钟')]) new_record = super(InheritRoomBooking, self).create(vals) employee_list = [] - user_list = [] if new_record.room_users_ids: - user_list.extend(new_record.room_users_ids.ids) - for user_id in new_record.room_users_ids: - if user_id.employee_id: - employee_list.append(user_id.employee_id.id) + for user in new_record.room_users_ids: + if user.employee_id: + employee_list.append(user.employee_id.id) if new_record.recorder_ids: employee_list.extend(new_record.recorder_ids.ids) - for emp in new_record.recorder_ids: - if emp.user_id: - user_list.append(emp.user_id.id) if new_record.host: employee_list.append(new_record.host.id) - if new_record.host.user_id: - user_list.append(new_record.host.user_id.id) employee_list = list(set(employee_list)) - user_list = list(set(user_list)) def get_hour_selection(datetime_obj): if not datetime_obj: @@ -76,16 +67,15 @@ class InheritRoomBooking(models.Model): elif nearest_minute == 45: return f"{hour % 24}.75" - if task_time_ids: + if new_record.task_time_ids: start_datetime = new_record.start_datetime start_date = start_datetime.date() request_hour_from = get_hour_selection(new_record.start_datetime) request_hour_to = get_hour_selection(new_record.stop_datetime) task_id = self.env['yuthon.will.task'].sudo().create({ 'name': new_record.name, - 'users_ids': [(6, 0, user_list)], 'employee_ids': [(6, 0, employee_list)], - 'task_time_ids': [(6, 0, task_time_ids.ids)], + 'task_time_ids': [(6, 0, new_record.task_time_ids.ids)], 'start_date': start_date, 'request_hour_from': request_hour_from, 'request_hour_to': request_hour_to,