diff --git a/vue-fastapi-backend/module_admin/dao/metadata_config_dao.py b/vue-fastapi-backend/module_admin/dao/metadata_config_dao.py index 7544db7..817bc69 100644 --- a/vue-fastapi-backend/module_admin/dao/metadata_config_dao.py +++ b/vue-fastapi-backend/module_admin/dao/metadata_config_dao.py @@ -401,6 +401,7 @@ class MetadataConfigDao: async def get_task_biz_config_list(cls, db: AsyncSession, query_object, is_page: bool = False): query = select(TaskBizConfig).where( TaskBizConfig.risk_lvl.like(f"%{query_object.risk_lvl}%") if query_object.risk_lvl else True, + TaskBizConfig.biz_name.like(f"%{query_object.biz_name}%") if query_object.biz_name else True, TaskBizConfig.isStop == query_object.isStop if query_object.isStop is not None else True, TaskBizConfig.create_time.between( datetime.combine(datetime.strptime(query_object.begin_time, '%Y-%m-%d'), time.min), diff --git a/vue-fastapi-backend/module_admin/service/metasecurity_service.py b/vue-fastapi-backend/module_admin/service/metasecurity_service.py index 280e8fc..8231941 100644 --- a/vue-fastapi-backend/module_admin/service/metasecurity_service.py +++ b/vue-fastapi-backend/module_admin/service/metasecurity_service.py @@ -634,7 +634,7 @@ async def generate_sql(tablesRowCol: dict, table_columns: dict): if not cfg.get("isHave", False) ] if no_config_tables: - raise ValueError(f"表：{','.join(no_config_tables)} 均未配置行列数据安全") + raise ValueError(f"您没有查看{','.join(no_config_tables)} 表记录的权限，请联系管理员配置相关行/列 数据安全策略") # ========= 1. 遍历每个表 ========= for table_name, config in tablesRowCol.items(): diff --git a/vue-fastapi-frontend/src/views/dataAsset/assetDetail/index.vue b/vue-fastapi-frontend/src/views/dataAsset/assetDetail/index.vue index 9dceb68..7c420c8 100644 --- a/vue-fastapi-frontend/src/views/dataAsset/assetDetail/index.vue +++ b/vue-fastapi-frontend/src/views/dataAsset/assetDetail/index.vue @@ -185,7 +185,7 @@ @@ -617,7 +617,7 @@ function submitForm() { "dataAstClas": JSON.stringify(astTags.value)?JSON.stringify(astTags.value):"", "dataAstCont": form.value.dataAstCont?form.value.dataAstCont:"", "dataAstFaq": form.value.dataAstFaq?form.value.dataAstFaq:"", - "dataAstSrc": form.value.dataAstSrc, + "dataAstSrc": getIdByName(form.value.dataAstSrc), "versionNo": form.value.versionNo, "ctrlFlag": form.value.ctrlFlag, } diff --git a/vue-fastapi-frontend/src/views/meta/metatask/index.vue b/vue-fastapi-frontend/src/views/meta/metatask/index.vue index 6da4b2a..f0897e8 100644 --- a/vue-fastapi-frontend/src/views/meta/metatask/index.vue +++ b/vue-fastapi-frontend/src/views/meta/metatask/index.vue @@ -779,8 +779,7 @@ const resetQuery = () => { proxy.resetForm("queryForm"); queryParams.value.dbRCode = clickNode.value?.id; - proxy.tree.setCurrentKey(null); - handleQuery(); + handleQuery(); }; const handleSelectionChange = (selection) => { diff --git a/vue-fastapi-frontend/src/views/metadataConfig/taskBizConfig/index.vue b/vue-fastapi-frontend/src/views/metadataConfig/taskBizConfig/index.vue index 7fc00da..94b1fa2 100644 --- a/vue-fastapi-frontend/src/views/metadataConfig/taskBizConfig/index.vue +++ b/vue-fastapi-frontend/src/views/metadataConfig/taskBizConfig/index.vue @@ -292,7 +292,7 @@ /> - 查询 + 查询 @@ -533,6 +533,11 @@ async function loadLeftTable() { ElMessage.error('加载左侧表数据失败') } } +async function seacheLeft() { + leftQueryForm.pageNum=1 + + loadLeftTable() +} async function loadRightTable(onum) { try { @@ -603,6 +608,7 @@ function openAddDialog() { onum: null, bizName: '', }) + loadLeftTable() rightTableData.value = [] open.value = true } diff --git a/vue-fastapi-frontend/src/views/system/flow/dataStdDictAppr.vue b/vue-fastapi-frontend/src/views/system/flow/dataStdDictAppr.vue index c47aac0..4cb3b97 100644 --- a/vue-fastapi-frontend/src/views/system/flow/dataStdDictAppr.vue +++ b/vue-fastapi-frontend/src/views/system/flow/dataStdDictAppr.vue @@ -30,8 +30,18 @@ getNameById(scope.row.srcSys) - - + + +