添加功能

yuthon_hr_employee/models/yuthon_hr_employee.py

@@ -295,10 +295,9 @@ class YuthonHrEmployee(models.Model):
         today = fields.Date.today()
         contract_employees = self.search([('end_comparison', 'in', ['red', 'yellow', 'blue'])])
         menu_id = self.env['ir.ui.menu'].search([('name', '=', '合同')], limit=1)
-        target_companies = ['集团本部', '天河物管', '天河粮储']
         hr_specialists = self.env['soong.user.role'].search([
-            ('company_id.name', 'in', target_companies),
-            ('name', '=', '人事专员')
+            ('name', '=', '人事专员'),
+            '|', ('company_id.name', 'in', ['集团本部', '天河粮储']), ('company_id', '=', 3)
         ])
         # 构建「公司名称: 人事专员wecom_userid」映射
         company_hr_map = {}
@@ -640,7 +639,7 @@ class YuthonHrEmployee(models.Model):
         }
 
     def compute_late_allowed(self):
-        employee = self.env["hr.employee"].search([('company_id.name', '=', '天河物管')])
+        employee = self.env["hr.employee"].search([('company_id', '=', 3)])
         for employee_id in employee:
             employee_id.late_allowed = 3
 
@@ -894,7 +893,7 @@ class YuthonHrEmployee(models.Model):
     def action_batch_fix_resource_calendar(self):
         """根据所属公司批量修复员工工作时间"""
         company_calendar_map = {
-            '天河物管': '行政考勤-物管',
+            3: '行政考勤-物管',
             '集团本部': '行政考勤-本部',
             '天河粮储': '行政考勤-粮储',
         }
@@ -909,11 +908,11 @@ class YuthonHrEmployee(models.Model):
 
         for employee in self:
             company_name = employee.company_id.name if employee.company_id else False
-            if not company_name or company_name not in company_calendar_map:
+            if not employee.company_id or (employee.company_id.id not in company_calendar_map and company_name not in company_calendar_map):
                 skipped_count += 1
                 continue
 
-            calendar_name = company_calendar_map[company_name]
+            calendar_name = company_calendar_map.get(company_name) or company_calendar_map.get(employee.company_id.id)
             calendar = calendar_map.get(calendar_name)
 
             if not calendar: