diff --git a/cmdb-api/api/commands/click_common_setting.py b/cmdb-api/api/commands/click_common_setting.py index 14bb2c8..ebbd882 100644 --- a/cmdb-api/api/commands/click_common_setting.py +++ b/cmdb-api/api/commands/click_common_setting.py @@ -177,7 +177,7 @@ class InitDepartment(object): else: resource_type = results[0] - for name in ['公司信息', '通知设置']: + for name in ['公司信息', '公司架构', '通知设置']: payload = dict( type_id=resource_type['id'], app_id=acl.app_name, diff --git a/cmdb-api/api/lib/common_setting/employee.py b/cmdb-api/api/lib/common_setting/employee.py index e642ccc..f2f82e0 100644 --- a/cmdb-api/api/lib/common_setting/employee.py +++ b/cmdb-api/api/lib/common_setting/employee.py @@ -480,7 +480,8 @@ class EmployeeCRUD(object): existed = EmployeeCRUD.get_employee_by_uid(_uid) 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] = '' @@ -515,7 +516,8 @@ class EmployeeCRUD(object): 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