From 6a3e0caa6b7821ccc2412ff218b25e5b3f1bd631 Mon Sep 17 00:00:00 2001 From: xueyinfei <1207092115@qq.com> Date: Tue, 23 Sep 2025 22:32:01 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=85=83=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E9=A1=B5=E9=9D=A2bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vue-fastapi-backend/module_admin/dao/meta_dao.py | 15 +++++++++++++++ .../module_admin/service/approval_service.py | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/vue-fastapi-backend/module_admin/dao/meta_dao.py b/vue-fastapi-backend/module_admin/dao/meta_dao.py index f9617ba..bde4cee 100644 --- a/vue-fastapi-backend/module_admin/dao/meta_dao.py +++ b/vue-fastapi-backend/module_admin/dao/meta_dao.py @@ -456,6 +456,21 @@ class MetaDao: ) return query_result + @classmethod + async def get_meta_col_supp_vett_by_table(cls, table: MetadataSuppInfoVett, db: AsyncSession): + query_result = ( + ( + await db.execute( + select(MetadataFldSuppInfoVett) + .where(MetadataFldSuppInfoVett.ssys_id == table.ssys_id, + MetadataFldSuppInfoVett.mdl_name == table.mdl_name, + MetadataFldSuppInfoVett.tab_eng_name == table.tab_eng_name, + MetadataFldSuppInfoVett.business_id == table.business_id).distinct() + ) + ).scalars().all() + ) + return query_result + @classmethod async def get_supp_column_by_vett(cls, column: MetadataFldSuppInfoVett, db: AsyncSession): query_result = ( diff --git a/vue-fastapi-backend/module_admin/service/approval_service.py b/vue-fastapi-backend/module_admin/service/approval_service.py index 34a07b3..e19fc82 100644 --- a/vue-fastapi-backend/module_admin/service/approval_service.py +++ b/vue-fastapi-backend/module_admin/service/approval_service.py @@ -122,7 +122,7 @@ class ApprovalService: if tableList[0].apply_status == 'canceled': raise ServiceException(message='所改业务已撤销申请') for table in tableList: - column_list = await MetaDao.get_meta_col_supp_vett(table, result_db) + column_list = await MetaDao.get_meta_col_supp_vett_by_table(table, result_db) if column_list is not None and len(column_list) > 0: for column in column_list: column.apply_status = operateType