duxin 5 сар өмнө
parent
commit
fd14d5ed55

+ 1 - 1
jyBXSubscribe/api/internal/logic/byPushHistoryLogic.go

@@ -52,7 +52,7 @@ func (l *ByPushHistoryLogic) ByPushHistory(req *types.SubscribeReq) (resp *types
 		matchkeys = strings.Join(matchkeysArr, ",")
 		matchkeys = strings.Join(matchkeysArr, ",")
 		matchkeys = strings.ReplaceAll(matchkeys, " ", ",")
 		matchkeys = strings.ReplaceAll(matchkeys, " ", ",")
 	}
 	}
-	if req.SelectTime == "" && req.PushTime != "" { //微信跳转过来的 按照推送时间查询导出
+	if req.PushTime != "" { //微信跳转过来的 按照推送时间查询导出
 		req.SelectTime = req.PushTime
 		req.SelectTime = req.PushTime
 	}
 	}
 	res, err := l.svcCtx.Suscribe.ByPushHistory(l.ctx, &bxsubscribe.SubscribeInfosReq{
 	res, err := l.svcCtx.Suscribe.ByPushHistory(l.ctx, &bxsubscribe.SubscribeInfosReq{

+ 1 - 1
jyBXSubscribe/api/internal/logic/subscribeListLogic.go

@@ -54,7 +54,7 @@ func (l *SubscribeListLogic) SubscribeList(req *types.SubscribeReq) (resp *types
 		matchkeys = strings.Join(matchkeysArr, ",")
 		matchkeys = strings.Join(matchkeysArr, ",")
 		matchkeys = strings.ReplaceAll(matchkeys, " ", ",")
 		matchkeys = strings.ReplaceAll(matchkeys, " ", ",")
 	}
 	}
-	if req.SelectTime == "" && req.PushTime != "" { //微信跳转过来的 按照推送时间查询导出
+	if req.PushTime != "" { //微信跳转过来的 按照推送时间查询导出
 		req.SelectTime = req.PushTime
 		req.SelectTime = req.PushTime
 	}
 	}
 	res, err := l.svcCtx.Suscribe.GetSubList(l.ctx, &bxsubscribe.SubscribeInfosReq{
 	res, err := l.svcCtx.Suscribe.GetSubList(l.ctx, &bxsubscribe.SubscribeInfosReq{