Merge branch 'feature/v1.1.47_ws' of BaseService/jyMicroservices into feature/v1.1.47

jyBXCore/rpc/entity/search.go

@@ -33,7 +33,8 @@ func NewKeyWordsSearch() *KeyWordsSearch {
 // IsEmptySearch  是否是空搜索，如果是空搜索查缓存数据
 func (kws *KeyWordsSearch) IsEmptySearch(in *bxcore.SearchReq) bool {
 	//有主关键词 或 选择了行业，都不是空搜索
-	if strings.TrimSpace(in.KeyWords) != "" || strings.TrimSpace(in.Industry) != "" || strings.TrimSpace(in.AdditionalWords) != "" {
+	//P492招标采购搜索匹配采购单位等优化--采购单位 || 中标企业 || 招标代理机构 有任何一个都可以进行搜索
+	if strings.TrimSpace(in.KeyWords) != "" || strings.TrimSpace(in.Industry) != "" || strings.TrimSpace(in.AdditionalWords) != "" || strings.TrimSpace(in.Winner) != "" || strings.TrimSpace(in.Buyer) != "" || strings.TrimSpace(in.Agency) != "" {
 		return false
 	}
 	//所有的未登录空搜索 缓存都最多查500条数据

jyBXCore/rpc/internal/logic/getsearchlistlogic.go

@@ -92,23 +92,6 @@ func (l *GetSearchListLogic) GetSearchList(in *bxcore.SearchReq) (*bxcore.Search
 			ErrMsg:  "无权限",
 		}, nil
 	}
-	////p353包含采购意向与拟建
-	////未登录用户访问全部信息类型 需要过滤掉 拟建和采购意向
-	////未登录用户 不能查看拟建信息 from P397
-	//if in.UserId == "" {
-	//	if strings.Contains(in.Subtype, "采购意向") || strings.Contains(in.Subtype, "拟建") {
-	//		var ss []string
-	//		for _, v := range strings.Split(in.Subtype, ",") {
-	//			if v != "采购意向" && !strings.Contains(v, "拟建") {
-	//				ss = append(ss, v)
-	//			}
-	//		}
-	//		in.Subtype = strings.Join(ss, ",")
-	//	}
-	//	if in.Subtype == "" {
-	//		in.Subtype = "招标预告,招标公告,招标结果,招标信用信息" //"拟建,招标预告,招标公告,招标结果,招标信用信息"
-	//	}
-	//}
 	t := time.Now()
 	//招标信息有效查询
 	res.IsLimit = 1