|
@@ -264,7 +264,7 @@ async def get_emergency_contact_list(
|
|
|
type_parent_list.append({"type_parent_id":type_parent,"type_parent":dict_data.dict_label})
|
|
|
area_info = id_get_area_info(db,info.area_code)
|
|
|
user_info = user_id_get_user_info(db,info.create_by)
|
|
|
- area_list = db_area.id_get_area_parent_list(db,info.area_code)
|
|
|
+ area_list = db_area.id_get_area_parent_list(db,info.area_code,[])
|
|
|
contact_infos_list.append({
|
|
|
"id": info.id,
|
|
|
"unit_id": info.unit_id,
|
|
@@ -315,11 +315,13 @@ async def get_emergency_contact_id_info(
|
|
|
area_info = id_get_area_info(db,contact.area_code)
|
|
|
user_info = user_id_get_user_info(db,contact.create_by)
|
|
|
|
|
|
+ area_list = db_area.id_get_area_parent_list(db, contact.area_code, [])
|
|
|
contact_result = {
|
|
|
"id": contact.id,
|
|
|
"unit_id": contact.unit_id,
|
|
|
"unit_name": contact.unit_name,
|
|
|
"name": contact.name,
|
|
|
+ "area_list":area_list,
|
|
|
"area_code":contact.area_code,
|
|
|
"area_name": area_info.area_name,
|
|
|
"position": contact.position,
|