From 830720e0d20e5bb74ce69063f8b06e9d25021c47 Mon Sep 17 00:00:00 2001 From: Marsway Date: Tue, 3 Feb 2026 17:43:13 +0800 Subject: [PATCH] update --- app/services/huobanyun_service.py | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/app/services/huobanyun_service.py b/app/services/huobanyun_service.py index a99eed1..a941468 100644 --- a/app/services/huobanyun_service.py +++ b/app/services/huobanyun_service.py @@ -198,24 +198,21 @@ class HuobanyunService: payload: Dict[str, Any] = {"table_id": table_id, "limit": limit, "offset": offset} order_status_field = self._resolve_field_key("订单状态") - project_no_field = "proj_id" project_no_field_id = self._resolve_field_key("项目单号") base_filters: List[Dict[str, Any]] = [ - {"field": project_no_field, "query": {"em": False}}, + {"field": project_no_field_id, "query": {"em": False}}, {"field": order_status_field, "query": {"ne": ["已完成"]}}, ] if linkage_project_no: base_filters.append( { - "or": [ - {"field": project_no_field, "query": {"in": [str(linkage_project_no)]}}, - {"field": project_no_field_id, "query": {"in": [str(linkage_project_no)]}}, - ] + "field": project_no_field_id, + "query": {"in": [str(linkage_project_no)]}, } ) payload["filter"] = {"and": base_filters} elif key and query_value: - filter_field = project_no_field if key == "2200000149785345" else key + filter_field = project_no_field_id if key == "2200000149785345" else key base_filters.append({"field": filter_field, "query": {"in": [str(query_value)]}}) payload["filter"] = {"and": base_filters} elif raw.get("filter"): @@ -223,10 +220,8 @@ class HuobanyunService: elif query_value: base_filters.append( { - "or": [ - {"field": project_no_field, "query": {"in": [query_value]}}, - {"field": project_no_field_id, "query": {"in": [query_value]}}, - ] + "field": project_no_field_id, + "query": {"in": [query_value]}, } ) payload["filter"] = {"and": base_filters}