Merge branch 'master' into feature/v1.1.64

jyBXCore/rpc/util/search.go

@@ -256,7 +256,7 @@ func SearchListFormat(userid, subInformation, propertyForm, industry string, rep
 						winnerId = entIdList[wk]
 					}
 				}
-				if IC.C.SearchWinner.Switch && winnerId == "" {
+				if IC.C.SearchWinner.Switch && len([]rune(winnerId)) < 24 { //验证是否真正的有效id
 					continue
 				}
 				if entity.RegWinner.MatchString(wv) {

jyBXSubscribe/rpc/model/push.go

@@ -280,6 +280,9 @@ func (s *subscribePush) InfoFormat(p *PushCa, info *map[string]interface{}, isPa
 					winnerId = entIdList[wk]
 				}
 			}
+			if len([]rune(winnerId)) < 24 { //验证是否真正的有效id
+				continue
+			}
 			formatInfo.WinnerInfo = append(formatInfo.WinnerInfo, &bxsubscribe.WinnerInfo{
 				Winner:       wv,                                                                                                              //中标企业 需要单独处理
 				WinnerTel:    common.ObjToString((*info)["winnertel"]),                                                                        //中标企业联系电话