From 57ecdbe6924d9d9d2a3e6c7a961962e2f80ea697 Mon Sep 17 00:00:00 2001
From: zhouyonggao <1971162852@qq.com>
Date: Thu, 18 Dec 2025 17:57:07 +0800
Subject: [PATCH] =?UTF-8?q?fix(exporter):=20=E4=BF=AE=E5=A4=8Dymt=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=BA=90=E4=B8=8Breseller=5Fid=5Feq=E8=BF=87=E6=BB=A4?=
 =?UTF-8?q?=E5=99=A8=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 不再将reseller_id_eq转换为merchant_id_in过滤条件
- 保留reseller_id_eq作为独立的WHERE子句进行过滤
- 删除零值的reseller_id_eq以避免无效查询条件
- 优化了过滤器的逻辑，避免删改遗漏问题
---
 server/internal/exporter/sqlbuilder.go | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/server/internal/exporter/sqlbuilder.go b/server/internal/exporter/sqlbuilder.go
index bd8d962..6fd16fc 100644
--- a/server/internal/exporter/sqlbuilder.go
+++ b/server/internal/exporter/sqlbuilder.go
@@ -178,17 +178,13 @@ func BuildSQLWithFields(req BuildRequest, whitelist map[string]bool) (string, []
 			delete(req.Filters, "merchant_id_eq")
 		}
 	}
-	// normalize reseller_id_eq (YMT 直连 merchant_id)
+	// reseller_id_eq (YMT): 不再转换为 merchant_id_in，保留作为单独 WHERE 条件
 	if req.Datasource == "ymt" && (req.MainTable == "order" || req.MainTable == "order_info") {
 		if v, ok := req.Filters["reseller_id_eq"]; ok {
 			if isZeroID(v) {
 				delete(req.Filters, "reseller_id_eq")
-			} else {
-				if _, has := req.Filters["merchant_id_in"]; !has {
-					req.Filters["merchant_id_in"] = []interface{}{v}
-				}
-				delete(req.Filters, "reseller_id_eq")
 			}
+			// 保留 reseller_id_eq 作为单独 WHERE 条件
 		}
 	}