Merge branch 'dev_v1.0.2_wh' of SocialPlatform/aiChat into feature/v1.0.2

internal/controller/aiSearch/aiSearch_v1_bidding_list.go

@@ -3,6 +3,7 @@ package aiSearch
 import (
 	"aiChat/api/aiSearch/v1"
 	"aiChat/internal/model"
+	"aiChat/utility"
 	"context"
 	"fmt"
 
@@ -27,10 +28,13 @@ func (c *ControllerV1) BiddingList(ctx context.Context, req *v1.BiddingListReq)
 	}
 	err = g.Model("ai_search_bidding").Where("chat_id = ? and  position_id=?", chatId, session.PositionId).OrderDesc("create_time").Scan(&hTmp)
 	if hTmp != nil && len(hTmp) > 0 {
+		collection := utility.GetMyBidCollect(ctx, session.PositionId)
 		for i := len(hTmp) - 1; i >= 0; i-- {
 			data := hTmp[i]
 			data.InfoId = encrypt.EncodeArticleId2ByCheck(data.InfoId)
-			hTmp[i] = data
+			if collection[data.InfoId] {
+				data.Collect = 1
+			}
 		}
 	}
 	return &v1.BiddingListRes{