diff --git a/vue-fastapi-backend/module_admin/service/meta_service.py b/vue-fastapi-backend/module_admin/service/meta_service.py index a331468..f310f4f 100644 --- a/vue-fastapi-backend/module_admin/service/meta_service.py +++ b/vue-fastapi-backend/module_admin/service/meta_service.py @@ -627,14 +627,18 @@ class MetaService: 'sheet[表信息]中行:' + str(index+1) + ' 导入的系统代码:' + row['ssys_cd'] + ',模式名称:' + row['mdl_name'] + ',对象英文名:' + row['tab_eng_name'] + '已存在补录待审核记录,请等待审批完成或撤回申请后,再行导入') + skip_table.append({'ssys_id': ssysId, 'mdl_name': row['mdl_name'], + 'tab_eng_name': row['tab_eng_name']}) + continue if hasTable.apply_status == 'pending': import_err_msg.append( 'sheet[字段信息]中行:' + str(index+1) + ' 导入的系统代码:' + row['ssys_cd'] + ',模式名称:' + row['mdl_name'] + ',对象英文名:' + row['tab_eng_name'] + '已存在待审核记录,请等待审批完成或撤回申请后,再行导入') - skip_table.append({'ssys_id': ssysId, 'mdl_name': row['mdl_name'], - 'tab_eng_name': row['tab_eng_name']}) - continue + skip_table.append({'ssys_id': ssysId, 'mdl_name': row['mdl_name'], + 'tab_eng_name': row['tab_eng_name']}) + continue + oldTable = await MetaDao.get_supp_table_by_vett(ssysId, row['mdl_name'], row['tab_eng_name'], result_db) tableInfo = await MetaDao.get_meta_table(ssysId, row['mdl_name'],