!9440 添加功能

Merge pull request !9440 from 李鹏宇/dev_zhou
This commit is contained in:
李鹏宇
2026-03-09 06:52:40 +00:00
committed by Gitee
2 changed files with 18 additions and 1 deletions
@@ -368,7 +368,8 @@ class OvertimeApprovals(models.Model):
('vacation_date', '=', vacation_date)
])
workflow_record_id = self.env['soong.workflow.record'].search([
('code', '=', self.code)
('code', '=', self.code),
('reclaim_state', '=', False)
])
workday = 0.0
legal_day = 0.0
+16
View File
@@ -353,6 +353,12 @@ class IssueLibrary(models.Model):
@api.depends_context('uid', 'company')
@api.depends('department_id')
def _compute_part_of_department(self):
is_manager = self.env.user.has_group('soong_workflow.group_soong_workflow_manager')
if is_manager:
# 管理员可以看到所有数据,全部标记为 True
for employee in self:
employee.member_of_department = True
return
user_employee = self._get_valid_employee_for_user()
active_department = user_employee.department_id
if active_department:
@@ -375,12 +381,22 @@ class IssueLibrary(models.Model):
return employee
def _search_part_of_department(self, operator, value):
# 检查当前用户是否属于管理员群组
is_manager = self.env.user.has_group('soong_workflow.group_soong_workflow_manager')
if is_manager:
# 管理员搜索时返回所有数据(domain 为空)
if (operator == '=' and value) or (operator == '!=' and not value):
return []
# 如果搜索条件是 False,则返回空数据
elif (operator == '=' and not value) or (operator == '!=' and value):
return [('id', '=', False)]
user_employee = self._get_valid_employee_for_user()
active_department = user_employee.department_id
if active_department:
base_domain = [('department_id', 'child_of', active_department.id)]
else:
base_domain = [('department_id', '=', False)]
return (['!'] if operator == '!=' else []) + base_domain
def _get_default_name_title(self):