|
@@ -164,9 +164,10 @@ async def update_contact(
|
|
|
old_person_other_info_list = get_person_other_info_by_person_id(db,person.id)
|
|
|
for old_person_other_info in old_person_other_info_list:
|
|
|
old_person_other_info.del_flag = '2'
|
|
|
- old_person_other_type_list = get_person_other_type_by_person_id(db, person.id)
|
|
|
+ old_person_other_type_list = get_person_other_type_by_person_id(db,person.id)
|
|
|
for old_person_other_type in old_person_other_type_list:
|
|
|
old_person_other_type.del_flag = '2'
|
|
|
+
|
|
|
for type_info in type_list:
|
|
|
type_parent_id = type_info['type_parent_id'] # get_type_parent_id_by_type_id(db,type_id)
|
|
|
for type_id in type_info['children']:
|
|
@@ -596,6 +597,8 @@ def import_data(db,file_path,user_id,file_info):
|
|
|
db.add_all(new_type_list)
|
|
|
data += new_type_list
|
|
|
d2 = sheet.cell(row, 12).value
|
|
|
+ if d2!='':
|
|
|
+ pass
|
|
|
|
|
|
# 重点部门
|
|
|
e1 = sheet.cell(row, 13).value
|