Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion cmdb-api/api/lib/common_setting/department.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,15 @@ def get_all_department_list(to_dict=True):
*criterion
).order_by(Department.department_id.asc())
results = query.all()
return [r.to_dict() for r in results] if to_dict else results
if to_dict:
datas = []
for r in results:
d = r.to_dict()
if r.department_id == 0:
d['department_name'] = ErrFormat.company_wide
datas.append(d)
return datas
return results


def get_all_employee_list(block=0, to_dict=True):
Expand Down
2 changes: 1 addition & 1 deletion cmdb-api/api/views/common_setting/department.py
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ def delete(self, _id):
class DepartmentParentView(APIView):
url_prefix = (f'{prefix}/allow_parent',)

def get(self):
def put(self):
department_id = request.args.get('department_id', None)
if department_id is None:
abort(400, ErrFormat.department_id_is_required)
Expand Down