Преглед изворни кода

Merge branch 'dev/v1.1.26_fuwencai' of BaseService/jyMicroservices into feature/v1.1.26

wangshan пре 2 година
родитељ
комит
d38c84a470
1 измењених фајлова са 19 додато и 17 уклоњено
  1. 19 17
      jyBXCore/api/internal/logic/searchListLogic.go

+ 19 - 17
jyBXCore/api/internal/logic/searchListLogic.go

@@ -97,25 +97,27 @@ func (l *SearchListLogic) SearchList(req *types.SearchReq) (resp *types.CommonRe
 					continue
 				}
 				if name == "winnerPerson" || name == "winnerTel" || name == "winner" {
-					var winnerInfo []*bxcore.WinnerInfo
-					for _, wv := range v.WinnerInfo {
-						if name == "winnerPerson" {
-							wv.WinnerPerson = detailMosaicTxt
+					if v.WinnerInfo != nil {
+						var winnerInfo []*bxcore.WinnerInfo
+						for _, wv := range v.WinnerInfo {
+							if name == "winnerPerson" {
+								wv.WinnerPerson = detailMosaicTxt
+							}
+							if name == "winnerTel" {
+								wv.WinnerTel = detailMosaicTxt
+							}
+							if name == "winner" {
+								wv.Winner = detailMosaicTxt
+							}
+							winnerInfo = append(winnerInfo, &bxcore.WinnerInfo{
+								Winner:       wv.Winner,
+								WinnerTel:    wv.WinnerTel,
+								WinnerPerson: wv.WinnerPerson,
+								WinnerId:     wv.WinnerId,
+							})
 						}
-						if name == "winnerTel" {
-							wv.WinnerTel = detailMosaicTxt
-						}
-						if name == "winner" {
-							wv.Winner = detailMosaicTxt
-						}
-						winnerInfo = append(winnerInfo, &bxcore.WinnerInfo{
-							Winner:       wv.Winner,
-							WinnerTel:    wv.WinnerTel,
-							WinnerPerson: wv.WinnerPerson,
-							WinnerId:     wv.WinnerId,
-						})
+						d["winnerInfo"] = winnerInfo
 					}
-					d["winnerInfo"] = winnerInfo
 				} else {
 					d[name] = detailMosaicTxt
 				}