|
|
@@ -329,6 +329,9 @@ 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)
|
|
|
+ nick_name = ''
|
|
|
+ if user_info:
|
|
|
+ nick_name = user_info.nick_name
|
|
|
area_list = db_area.id_get_area_parent_list(db,info.area_code,[])
|
|
|
if info.order_num ==-1:
|
|
|
order_num = ''
|
|
|
@@ -349,7 +352,7 @@ async def get_emergency_contact_list(
|
|
|
"online_status":'0',
|
|
|
"create_time": info.create_time.strftime('%Y-%m-%d %H:%M:%S'),
|
|
|
"create_by":info.create_by,
|
|
|
- "create_user":user_info.nick_name,
|
|
|
+ "create_user":nick_name,
|
|
|
"type_parent_list":type_parent_list
|
|
|
})
|
|
|
# 返回结果+
|
|
|
@@ -531,7 +534,9 @@ 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)
|
|
|
-
|
|
|
+ nick_name = ''
|
|
|
+ if user_info:
|
|
|
+ nick_name = user_info.nick_name
|
|
|
area_list = db_area.id_get_area_parent_list(db, contact.area_code, [])
|
|
|
if contact.order_num == -1:
|
|
|
order_num = ''
|
|
|
@@ -552,7 +557,7 @@ async def get_emergency_contact_id_info(
|
|
|
"online_status":'0',
|
|
|
"create_time": contact.create_time.strftime('%Y-%m-%d %H:%M:%S'),
|
|
|
"create_by":contact.create_by,
|
|
|
- "create_user":user_info.nick_name,
|
|
|
+ "create_user":nick_name,
|
|
|
"type_list":[]
|
|
|
}
|
|
|
type_parent_id_list = []
|
