From 4dce056c5f27e67b21572962a40cd734b9d3ef7c Mon Sep 17 00:00:00 2001
From: hailin <hailin@gdzx.xyz>
Date: Fri, 20 Jun 2025 17:00:53 +0800
Subject: [PATCH] .

---
 pkg/dal/core/core_biz.go | 11 +++++++----
 pkg/dal/dao/news.go      | 17 +++++++++++++----
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/pkg/dal/core/core_biz.go b/pkg/dal/core/core_biz.go
index 29b7d1c..694d543 100644
--- a/pkg/dal/core/core_biz.go
+++ b/pkg/dal/core/core_biz.go
@@ -948,15 +948,18 @@ func (m *BizCore) NewsAsyncBatch(ctx *itypes.Context, req *proto.NewsAsyncBatchR
 }
 
 func (m *BizCore) NewsPullNew(ctx *itypes.Context, req *proto.NewsPullNewReq) (resp *proto.NewsPullNewResp, total int64, code itypes.BizCode) {
-	// 1. 提取 OrgIDs
-	orgIDs := make([]int64, 0, len(req.List))
+	// 1. 转换 List 为 Pairs（只用 OrgId，Digest 忽略但结构体字段需要赋值）
+	pairs := make([]dao.OrgDigestPair, 0, len(req.List))
 	for _, item := range req.List {
-		orgIDs = append(orgIDs, item.OrgID)
+		pairs = append(pairs, dao.OrgDigestPair{
+			OrgId:  item.OrgID, // 这个字段名必须匹配 dao.OrgDigestPair 里的定义
+			Digest: "",         // 虽然不处理，但结构体字段得占上
+		})
 	}
 
 	// 2. 调用 DAO 查询
 	dos, total, err := m.newsDAO.QueryPullNew(&dao.NewsPullNewCondition{
-		OrgIDs: orgIDs,
+		Pairs: pairs,
 	})
 	if err != nil {
 		return nil, 0, itypes.NewBizCodeDatabaseError(err.Error())
diff --git a/pkg/dal/dao/news.go b/pkg/dal/dao/news.go
index e7ce0c2..4af3eda 100644
--- a/pkg/dal/dao/news.go
+++ b/pkg/dal/dao/news.go
@@ -22,8 +22,12 @@ type NewsAsyncCondition struct {
 	Digest string
 }
 
+// type NewsPullNewCondition struct {
+// 	OrgIDs []int64 `json:"org_ids"`
+// }
+
 type NewsPullNewCondition struct {
-	OrgIDs []int64 `json:"org_ids"`
+	Pairs []OrgDigestPair
 }
 
 const (
@@ -484,10 +488,15 @@ func (dao *NewsDAO) QueryPullNew(cond *NewsPullNewCondition) (dos []*models.News
 			models.NEWS_COLUMN_EXTRA_DATA,
 		)
 
-	// 只按 org_ids 过滤
-	if len(cond.OrgIDs) > 0 {
-		e.NotIn(models.NEWS_COLUMN_ORG_ID, cond.OrgIDs)
+	// 🔧 仅提取 org_id，忽略 digest
+	if len(cond.Pairs) > 0 {
+		orgIDs := make([]int64, 0, len(cond.Pairs))
+		for _, p := range cond.Pairs {
+			orgIDs = append(orgIDs, p.OrgID)
+		}
+		e.Where(fmt.Sprintf("%s NOT IN (?)", models.NEWS_COLUMN_ORG_ID), orgIDs)
 	}
+
 	_, total, err = e.QueryEx()
 	if err != nil {
 		log.Errorf("QueryPullNew failed: %v", err)