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

internal/controller/aiSearch/aiSearch_v1_bidding_list.go

@@ -4,26 +4,19 @@ import (
 	"aiChat/api/aiSearch/v1"
 	"aiChat/internal/model"
 	"aiChat/utility"
-	"context"
-	"fmt"
-
 	"app.yhyue.com/moapp/jybase/encrypt"
+	"context"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/util/gconv"
 )
 
 func (c *ControllerV1) BiddingList(ctx context.Context, req *v1.BiddingListReq) (res *v1.BiddingListRes, err error) {
-	var hTmp []v1.ResBidding
+	hTmp := []v1.ResBidding{}
 	session := model.SessionCtx.Get(ctx).JSession
-	if session.PositionId <= 0 {
-		return nil, fmt.Errorf("请登录")
-	}
 	chatId := gconv.Int64(encrypt.SE.Decode4HexByCheck(req.ChatId))
 	if chatId == 0 {
 		return &v1.BiddingListRes{
-			ErrorCode: 0,
-			ErrorMsg:  "",
-			Data:      hTmp,
+			Data: hTmp,
 		}, nil
 	}
 	err = g.Model("ai_search_bidding").Where("chat_id = ? and  position_id=?", chatId, session.PositionId).OrderDesc("create_time").Scan(&hTmp)
@@ -37,9 +30,8 @@ func (c *ControllerV1) BiddingList(ctx context.Context, req *v1.BiddingListReq)
 			}
 		}
 	}
+
 	return &v1.BiddingListRes{
-		ErrorCode: 0,
-		ErrorMsg:  "",
-		Data:      hTmp,
+		Data: hTmp,
 	}, nil
 }

internal/controller/aiSearch/aiSearch_v1_session_detail.go

@@ -30,7 +30,7 @@ func (c *ControllerV1) SessionDetail(ctx context.Context, req *v1.SessionDetailR
 		for _, v := range gconv.Maps(r1["answer"]) {
 			bidding := &v1.ResBidding{}
 			_ = gconv.Struct(v, bidding)
-			bidding.Id = encrypt.SE.Encode2HexByCheck(bidding.Id)
+			bidding.InfoId = encrypt.SE.Encode2HexByCheck(bidding.InfoId)
 			blist = append(blist, bidding)
 		}
 		item.Answer = &v1.ChatRes{