浏览代码

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

wangshan 1 年之前
父节点
当前提交
d3b2cd88cf
共有 3 个文件被更改,包括 9 次插入5 次删除
  1. 1 1
      jyBXCore/go.mod
  2. 2 2
      jyBXCore/go.sum
  3. 6 2
      jyBXCore/rpc/entity/search.go

+ 1 - 1
jyBXCore/go.mod

@@ -7,7 +7,7 @@ require (
 	app.yhyue.com/moapp/jylogx v0.0.0-20230522075659-ae6fbedb92bc
 	app.yhyue.com/moapp/jypkg v0.0.0-20230726073749-b08ff9ef154f
 	bp.jydev.jianyu360.cn/BaseService/gateway v1.3.4
-	bp.jydev.jianyu360.cn/BaseService/powerCheckCenter v0.0.0-20230225125145-431a4f70093a
+	bp.jydev.jianyu360.cn/BaseService/powerCheckCenter v0.0.0-20230811012937-712b5b4f6436
 	bp.jydev.jianyu360.cn/BaseService/userCenter v1.2.13
 	github.com/go-sql-driver/mysql v1.7.1
 	github.com/gogf/gf/v2 v2.3.1

+ 2 - 2
jyBXCore/go.sum

@@ -25,8 +25,8 @@ bp.jydev.jianyu360.cn/BaseService/entManageApplication v0.0.0-20230214091519-89a
 bp.jydev.jianyu360.cn/BaseService/gateway v0.0.0-20220419090715-88ddb32961be/go.mod h1:Yj4oabIGItuMoF0BXYLz2XAnF581kxgXBrvlUtIJrkI=
 bp.jydev.jianyu360.cn/BaseService/gateway v1.3.4 h1:zl5eZrKDBENVVBUiPpzyQQ0/SBdGUmZS3thXycSEO1g=
 bp.jydev.jianyu360.cn/BaseService/gateway v1.3.4/go.mod h1:BMLd/5wb3BIEGhnEgF9y1sJN9P5/Dw9kYsoiE9V8I9g=
-bp.jydev.jianyu360.cn/BaseService/powerCheckCenter v0.0.0-20230225125145-431a4f70093a h1:JX2jEMrbdLzXfVC/nTUvdFOkqNj5DUxkJFjl3XE1gyg=
-bp.jydev.jianyu360.cn/BaseService/powerCheckCenter v0.0.0-20230225125145-431a4f70093a/go.mod h1:5nimT8GJh46AyfeeDeyRlDQygMlO7TRM8Pwm41Gxemc=
+bp.jydev.jianyu360.cn/BaseService/powerCheckCenter v0.0.0-20230811012937-712b5b4f6436 h1:Yu8sUq2w49wqTpjDbRzv0wiJfFi2+K9nJYGqNxP12Vk=
+bp.jydev.jianyu360.cn/BaseService/powerCheckCenter v0.0.0-20230811012937-712b5b4f6436/go.mod h1:rCCaOSWBYfQabf/yIvSVheSPtN2THnHeTl2J5/RrcuU=
 bp.jydev.jianyu360.cn/BaseService/resourceCenter v0.0.0-20220418005748-8ba5d936dd53/go.mod h1:E5lcDI3k4FESLxiAetCfWQTq8qfpy9cv0yN1oKoEO34=
 bp.jydev.jianyu360.cn/BaseService/resourceCenter v0.0.0-20220419023723-0b32d4a41751/go.mod h1:6KL5LMEku83uRbre0W/bj5kXG2I6pJGBFtktmtp51yM=
 bp.jydev.jianyu360.cn/BaseService/resourceCenter v0.0.0-20220420075831-0b59892e9982/go.mod h1:wsHNO91h37H+xE4ZNny0yd7mtpODeDJxbVYhIRMR+qw=

+ 6 - 2
jyBXCore/rpc/entity/search.go

@@ -160,7 +160,10 @@ func (kws *KeyWordsSearch) GetSearchKeyWordsQueryStr(in *bxcore.SearchReq) (sear
 // SearchParamsHandle 搜索条件 处理
 func (kws *KeyWordsSearch) SearchParamsHandle(in *bxcore.SearchReq) []string {
 	//判断用户身份
-	var userInfo powercheck.CheckResp
+	var (
+		userInfo     powercheck.CheckResp
+		registerDate int64 = 0
+	)
 	if in.UserId != "" {
 		baseUserId, _ := strconv.ParseInt(in.NewUserId, 10, 64)
 		accountId, _ := strconv.ParseInt(in.AccountId, 10, 64)
@@ -169,12 +172,13 @@ func (kws *KeyWordsSearch) SearchParamsHandle(in *bxcore.SearchReq) []string {
 		userInfo = *IC.Middleground.PowerCheckCenter.Check(in.AppId, in.MgoUserId, baseUserId, accountId, in.EntId, positionType, positionId)
 		//是否是付费用户
 		in.IsPay = !userInfo.Free.IsFree
+		registerDate = userInfo.Free.Registedate
 	}
 	//默认搜索范围
 	if in.SelectType == "" {
 		in.SelectType = "title,content"
 	}
-	queryItems := util.GetQueryItems(in.SelectType, IC.C.BidSearchOldUserLimit, userInfo.Free.Registedate, in.IsPay)
+	queryItems := util.GetQueryItems(in.SelectType, IC.C.BidSearchOldUserLimit, registerDate, in.IsPay)
 	in.SelectType = strings.Join(queryItems, ",")
 	// in.SearchGroup 搜索分组 搜索分组:默认0:全部;1:招标采购公告;2:超前项目
 	//	详情页判断是否能使用超前项目  老版超级订阅、大会员、商机管理有权限