发包脚本上传,空值覆盖问题

vue-fastapi-backend/module_admin/dao/meta_dao.py

@@ -305,7 +305,7 @@ class MetaDao:
             select(MetadataSuppInfoVett).where(
                 MetadataSuppInfoVett.business_id == businuessId).distinct()
         )
-        result = await PageUtil.paginate(db, query, 0, 0, False)
+        result = (await db.execute(query)).scalars().all()
         return result
 
     @classmethod

vue-fastapi-backend/module_admin/service/data_ast_content_service.py

@@ -84,7 +84,6 @@ class DataCatalogService:
                         'dataAstUpdTime': item['dataAstUpdTime'],
                         'dataAstSrc': item['dataAstSrc'],
                         'astNo': item['astNo'],
-                        'relaOnum': item['relaOnum'],
                         'bookmarkOrde': item['bookmarkOrde'],
                         'bookmarkFlag': item['bookmarkFlag'],
                         'sczcFlag': item['sczcFlag']
@@ -286,7 +285,7 @@ class DataCatalogService:
             # 添加子节点
             sys_groups[sys_name]["children"].append({
                 "dataAssetCatalogNo": eng_name,
-                "dataAssetCatalogName": cn_name,
+                "dataAssetCatalogName": cn_name if cn_name else eng_name,
                 "dataAssetCatalogAstno": ast_no,
                 "rel_status": rel_status
             })

vue-fastapi-backend/module_admin/service/meta_service.py

@@ -534,7 +534,7 @@ class MetaService:
         """
         table_header_list = ['系统代码', '模式名称', '对象英文名', '补录对象名称', '补录对象描述', '负责人']
         column_header_list = ['系统代码', '模式名称', '对象英文名', '字段英文名', '字段补录名', '补录主键',
-                              '补录字段描述', '引用字典/标准', '安全等级', '负责人']
+                              '补录字段描述', '引用字典/标准', '安全等级']
         selector_header_list = ['补录主键', '安全等级']
         option_list = [{}, {'补录主键': ['是', '否'], '安全等级': ['S1', 'S2', 'S3', 'S4']}]
         sheet_config1 = dict(
@@ -589,8 +589,7 @@ class MetaService:
             '补录主键': 'crrct_pk_flag',
             '补录字段描述': 'fld_desc',
             '引用字典/标准': 'data_dict_id',
-            '安全等级': 'data_sec_lvl',
-            '负责人': 'rec_subm_prsn'
+            '安全等级': 'data_sec_lvl'
         }
         contents = await file.read()
         excel_file = pd.ExcelFile(io.BytesIO(contents))
@@ -753,7 +752,6 @@ class MetaService:
                         'crrct_pk_flag'] == '是' else False
                     suppColumnInfo.fld_desc = row['fld_desc']
                     suppColumnInfo.data_sec_lvl = row['data_sec_lvl']
-                    suppColumnInfo.rec_subm_prsn = row['rec_subm_prsn']
                     suppColumnInfo.data_dict_id = dataDictId if dataDictId != '' else None
                 else:
                     suppColumnInfo.fld_crrct_name = row['fld_crrct_name'] if row['fld_crrct_name'] and \
@@ -767,9 +765,6 @@ class MetaService:
                     suppColumnInfo.data_sec_lvl = row['data_sec_lvl'] if row['data_sec_lvl'] and \
                                                                          str(row[
                                                                                  'data_sec_lvl'].strip()) != '' else oldColumn.data_sec_lvl if oldColumn else None
-                    suppColumnInfo.rec_subm_prsn = row['rec_subm_prsn'] if row['rec_subm_prsn'] and \
-                                                                           str(row[
-                                                                                   'rec_subm_prsn']).strip() != '' else oldColumn.rec_subm_prsn if oldColumn else None
                     suppColumnInfo.data_dict_id = dataDictId if dataDictId != '' else oldColumn.data_dict_id \
                         if oldColumn else None
                 suppColumnInfo.pic = oldColumn.pic if oldColumn else None