From dfbba103cd0f2a58c3a0ed27c29dad03509a3995 Mon Sep 17 00:00:00 2001 From: simontigers <47096077+simontigers@users.noreply.github.com> Date: Mon, 9 Oct 2023 19:25:49 +0800 Subject: [PATCH] fix: init company structure resource (#191) * fix: init company structure resource * fix: notice_info null --- cmdb-api/api/commands/click_common_setting.py | 2 +- cmdb-api/api/lib/common_setting/employee.py | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/cmdb-api/api/commands/click_common_setting.py b/cmdb-api/api/commands/click_common_setting.py index 14bb2c8c..ebbd8821 100644 --- a/cmdb-api/api/commands/click_common_setting.py +++ b/cmdb-api/api/commands/click_common_setting.py @@ -177,7 +177,7 @@ def init_backend_resource(self): 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 e642ccc4..f2f82e03 100644 --- a/cmdb-api/api/lib/common_setting/employee.py +++ b/cmdb-api/api/lib/common_setting/employee.py @@ -480,7 +480,8 @@ def remove_bind_notice_by_uid(_platform, _uid): 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 @@ def bind_notice_by_uid(_platform, _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] = '' if not target_id else target_id