Merge branch 'dev' of https://gitee.com/jinan-pengyusen-data/gzth into dev_wang

yuthon_catering/controllers/restaurant.py

@@ -47,10 +47,8 @@ class RestaurantController(Controller):
     @exception_handle
     def collect_catering(self, **kwargs):
         user_id = int(kwargs.get('user_id'))
-        employee = request.env['hr.employee'].sudo().search([('id', '=', user_id)])
-        _logger.info(f'---当前获取数据--{user_id}---')
-        _logger.info(f'---当前获取数据--{employee.id}---{employee.name}')
         menu_date = kwargs.get('menu_date', date.today())
+        employee = request.env['hr.employee'].sudo().search([('user_id', '=', user_id)])
         existing_record = request.env['yuthon.catering'].search([
             ('date', '=', menu_date),
             ('employee_id', '=', employee.id)

yuthon_catering/models/yuthon_catering.py

@@ -47,7 +47,7 @@ class YuthonCatering(models.Model):
     def task_catering(self):
         employee_ids = self.env['yuthon.catering.conf'].search([])[0].employee_ids
         for emp in employee_ids:
-            url = f"https://phone.thtzjt.com/phone/Restaurant/{emp.id}"
+            url = f"https://phone.thtzjt.com/phone/Restaurant/{emp.user_id.id}"
             self.sudo().env["wecom.apps"].sync_send_message_textcard(
                 category='can',
                 user_id=emp.wecom_userid,

yuthon_holiday/models/inherit_hr_leave.py

@@ -1117,7 +1117,7 @@ class HolidaysRequestBatch(models.Model):
 
             # 5. 扣减有效待提交额度（优先扣上年）
             for leave in valid_pending_leaves:
-                leave_days = leave.number_of_days_display or 0.0
+                leave_days = leave.length_leave or 0.0
                 leave_type_name = leave.holiday_status_id.name
                 if leave_type_name not in leave_type_mapping or leave_days <= 0:
                     continue