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

fix(api): edit employee depart with rid=0 (#420)

This commit is contained in:
simontigers 2024-03-12 17:46:50 +08:00 committed by GitHub
parent 34204ec4c6
commit 7a170ab397
1 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
cmdb-api/api/tasks/common_setting.py
View File

@ -49,21 +49,20 @@ def edit_employee_department_in_acl(e_list, new_d_id, op_uid):
continue continue
old_d_rid_in_acl = role_map.get(old_department.department_name, 0) old_d_rid_in_acl = role_map.get(old_department.department_name, 0)
if old_d_rid_in_acl == 0: if old_d_rid_in_acl > 0:
return if old_d_rid_in_acl != old_department.acl_rid:
if old_d_rid_in_acl != old_department.acl_rid: old_department.update(
old_department.update( acl_rid=old_d_rid_in_acl
acl_rid=old_d_rid_in_acl )
) d_acl_rid = old_department.acl_rid if old_d_rid_in_acl == old_department.acl_rid else old_d_rid_in_acl
d_acl_rid = old_department.acl_rid if old_d_rid_in_acl == old_department.acl_rid else old_d_rid_in_acl payload = {
payload = { 'app_id': 'acl',
'app_id': 'acl', 'parent_id': d_acl_rid,
'parent_id': d_acl_rid, }
} try:
try: acl.remove_user_from_role(employee_acl_rid, payload)
acl.remove_user_from_role(employee_acl_rid, payload) except Exception as e:
except Exception as e: result.append(ErrFormat.acl_remove_user_from_role_failed.format(str(e)))
result.append(ErrFormat.acl_remove_user_from_role_failed.format(str(e)))
payload = { payload = {
'app_id': 'acl', 'app_id': 'acl',