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

jyBXCore/rpc/internal/logic/getsearchlistlogic.go

@@ -51,6 +51,7 @@ func (l *GetSearchListLogic) GetSearchList(in *bxcore.SearchReq) (*bxcore.Search
 			KeyWords:   in.KeyWords,
 			Platform:   in.Platform,
 			UserType:   in.UserType,
+			Subtype:    "招标预告,招标公告,招标结果,招标信用信息",
 		}
 		// 搜索范围只允许筛选 标题和正文 其他的过滤掉
 		var selectType []string
@@ -92,23 +93,23 @@ 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 = "招标预告,招标公告,招标结果,招标信用信息" //"拟建,招标预告,招标公告,招标结果,招标信用信息"
-		}
-	}
+	////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

jyBXCore/rpc/model/es/search.go

@@ -285,6 +285,9 @@ func GetBidSearchQuery(in *bxcore.SearchReq) string {
 			allType += `"` + v + `"`
 		}
 		allType += `]}}`
+		if typeInt == len(strings.Split(subtype, ",")) {
+			allType = ``
+		}
 	}
 	//信息类型  一级分类
 	log.Println("topType:", topType)