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

fix: init company structure resource (#191) 

* fix: init company structure resource

* fix: notice_info null
This commit is contained in:
simontigers 2023-10-09 19:25:49 +08:00 committed by GitHub
parent d501436e3d
commit dd8f66a3fa
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmdb-api/api/commands/click_common_setting.py
View File

@ -177,7 +177,7 @@ class InitDepartment(object):
else: else:
resource_type = results[0] resource_type = results[0]
for name in ['公司信息', '通知设置']: for name in ['公司信息', '公司架构', '通知设置']:
payload = dict( payload = dict(
type_id=resource_type['id'], type_id=resource_type['id'],
app_id=acl.app_name, app_id=acl.app_name,

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

@ -480,7 +480,8 @@ class EmployeeCRUD(object):
existed = EmployeeCRUD.get_employee_by_uid(_uid) existed = EmployeeCRUD.get_employee_by_uid(_uid)
employee_data = existed.to_dict() employee_data = existed.to_dict()
notice_info = copy.deepcopy(employee_data.get('notice_info', {})) notice_info = employee_data.get('notice_info', {})
notice_info = copy.deepcopy(notice_info) if notice_info else {}
notice_info[_platform] = '' notice_info[_platform] = ''
@ -515,7 +516,8 @@ class EmployeeCRUD(object):
employee_data = existed.to_dict() employee_data = existed.to_dict()
notice_info = copy.deepcopy(employee_data.get('notice_info', {})) notice_info = employee_data.get('notice_info', {})
notice_info = copy.deepcopy(notice_info) if notice_info else {}
notice_info[_platform] = '' if not target_id else target_id notice_info[_platform] = '' if not target_id else target_id