|
|
@@ -6,13 +6,6 @@ import (
|
|
|
"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXCore/rpc/service"
|
|
|
"bp.jydev.jianyu360.cn/BaseService/jyMicroservices/jyBXCore/rpc/util"
|
|
|
"context"
|
|
|
-<<<<<<< HEAD
|
|
|
-=======
|
|
|
- "jyBXCore/rpc/entity"
|
|
|
- IC "jyBXCore/rpc/init"
|
|
|
- "jyBXCore/rpc/service"
|
|
|
- "jyBXCore/rpc/util"
|
|
|
->>>>>>> master
|
|
|
"strings"
|
|
|
"time"
|
|
|
|
|
|
@@ -76,9 +69,7 @@ func (l *GetSearchListLogic) GetSearchList(in *bxcore.SearchReq) (*bxcore.Search
|
|
|
//
|
|
|
in.SelectType = strings.Join(selectType, ",")
|
|
|
}
|
|
|
-<<<<<<< HEAD
|
|
|
isWhite, _ := service.IsOnTheWhitelist(in.UserId)
|
|
|
-=======
|
|
|
//模糊检索数重新格式化
|
|
|
nin := &bxcore.SearchReq{
|
|
|
AppId: in.AppId,
|
|
|
@@ -122,7 +113,6 @@ func (l *GetSearchListLogic) GetSearchList(in *bxcore.SearchReq) (*bxcore.Search
|
|
|
Agency: in.Agency,
|
|
|
IsFuzzyNumber: true,
|
|
|
}
|
|
|
->>>>>>> master
|
|
|
//处理搜索条件
|
|
|
heightWords := ks.SearchParamsHandle(in, isWhite)
|
|
|
if (in.PageNum < 0 && in.PageSize < 0) || ks.IsSearch == "F" { //没有权限
|
|
|
@@ -179,7 +169,7 @@ func (l *GetSearchListLogic) GetSearchList(in *bxcore.SearchReq) (*bxcore.Search
|
|
|
}
|
|
|
// 精准模式不足50条的非空标讯查询 匹配模糊查询数
|
|
|
if res.Count < IC.C.PaySearchLimit.PrecisionNum && in.SearchMode == 0 && in.KeyWords != "" {
|
|
|
- ks.SearchParamsHandle(nin)
|
|
|
+ ks.SearchParamsHandle(nin, isWhite)
|
|
|
res.BCount = service.GetBidSearchCount(nin)
|
|
|
log.Println("精准查询数据不足 匹配模糊查询数：", res.BCount)
|
|
|
}
|
