From 542befe8a6622c4961d3df8f9dd17c00a13e6682 Mon Sep 17 00:00:00 2001 From: raja <1647193241@qq.com> Date: Tue, 14 Jan 2025 11:37:42 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E8=A7=84=E5=88=99=E5=AE=A1=E8=AE=A1-?= =?UTF-8?q?=E7=AD=96=E7=95=A5=E6=96=B0=E5=A2=9E/=E7=BC=96=E8=BE=91-?= =?UTF-8?q?=E5=90=8E=E7=AB=AF=E6=8E=A5=E5=8F=A3=20--story=3D121513458?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 【新增】 1. 审计策略列表接口支持对无标签进行筛选 【修复】 1. 联表标签列表返回的数量异常 --- src/backend/services/web/strategy_v2/resources.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/backend/services/web/strategy_v2/resources.py b/src/backend/services/web/strategy_v2/resources.py index a94bc144..d40874d7 100644 --- a/src/backend/services/web/strategy_v2/resources.py +++ b/src/backend/services/web/strategy_v2/resources.py @@ -329,6 +329,9 @@ def perform_request(self, validated_request_data): queryset = queryset.filter( strategy_id__in=[s.strategy_id for s in resource.strategy_v2.list_has_update_strategy()] ) + if NO_TAG_ID in validated_request_data.get("tag", []): + validated_request_data["tag"] = [t for t in validated_request_data["tag"] if t != NO_TAG_ID] + queryset = queryset.exclude(strategy_id__in=StrategyTag.objects.values_list("strategy_id").distinct()) # tag filter if validated_request_data.get("tag"): # tag 筛选 @@ -1007,9 +1010,9 @@ def perform_request(self, validated_request_data): { "tag_name": str(NO_TAG_NAME), "tag_id": NO_TAG_ID, - "link_table_count": LinkTable.objects.exclude( - uid__in=LinkTableTag.objects.values_list("link_table_uid").distinct() - ).count(), + "link_table_count": LinkTable.list_max_version_link_table() + .exclude(uid__in=LinkTableTag.objects.values_list("link_table_uid").distinct()) + .count(), } ] + tag_count # response