Explorar o código

Merge branch 'dev/v1.1.48_wjh' of BaseService/jyMicroservices into feature/v1.1.48

wangjianghan hai 1 ano
pai
achega
4ff6dc645f
Modificáronse 1 ficheiros con 8 adicións e 6 borrados
  1. 8 6
      jyBXSubscribe/rpc/internal/logic/getsublistlogic.go

+ 8 - 6
jyBXSubscribe/rpc/internal/logic/getsublistlogic.go

@@ -118,12 +118,14 @@ func (l *GetSubListLogic) GetSubList(in *bxsubscribe.SubscribeInfosReq) (*bxsubs
 	isRecommend := false
 	if in.PageNum == 1 && spqp.IsEmpty() && (len(list) == 0 || (in.PositionType == 0 && spqp.SubPushInactive == -1)) && in.IsEnt == false {
 		hasNextPage, total, list = model.NewSubscribePush(in.UserType).DefaultDatas(spqp, bsp, in.UserType)
-		if len(list) == 0 {
-			hasNextPage, total, list = model.NewSubscribePush(in.UserType).SubRecList(common.ObjToString(common.If(in.PositionType == 0, spqp.UserId, spqp.EntUserId)), bsp.Keyword)
-		}
-		if len(list) == 0 {
-			isRecommend = true
-			hasNextPage, total, list = model.NewSubscribePush(in.UserType).GetRecListByEs()
+		if in.Source == "home" {
+			if len(list) == 0 {
+				hasNextPage, total, list = model.NewSubscribePush(in.UserType).SubRecList(common.ObjToString(common.If(in.PositionType == 0, spqp.UserId, spqp.EntUserId)), bsp.Keyword)
+			}
+			if len(list) == 0 {
+				isRecommend = true
+				hasNextPage, total, list = model.NewSubscribePush(in.UserType).GetRecListByEs()
+			}
 		}
 	}