7x31
/
cmdb
mirror of https://github.com/veops/cmdb.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix(api): common i18n wide (#351) 

* fix(api): common_i18n wide

* fix(api): department i18n
This commit is contained in:
simontigers 2024-01-03 13:26:58 +08:00 committed by GitHub
parent 7186bdac9c
commit 9ee2776bdd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmdb-api/api/lib/common_setting/department.py
View File

@ -385,6 +385,9 @@ class DepartmentCRUD(object):
d['employee_count'] = len(list(filter(lambda e: e['department_id'] in d_ids, all_employee_list))) d['employee_count'] = len(list(filter(lambda e: e['department_id'] in d_ids, all_employee_list)))
if int(department_parent_id) == -1:
d['department_name'] = ErrFormat.company_wide
return all_departments, department_id_list return all_departments, department_id_list
@staticmethod @staticmethod

2
cmdb-api/api/lib/common_setting/employee.py
View File

@ -296,6 +296,8 @@ class EmployeeCRUD(object):
for r in pagination.items: for r in pagination.items:
d = r.Employee.to_dict() d = r.Employee.to_dict()
d['department_name'] = r.Department.department_name if r.Department else '' d['department_name'] = r.Department.department_name if r.Department else ''
if r.Employee.department_id == 0:
d['department_name'] = ErrFormat.company_wide
employees.append(d) employees.append(d)
return { return {