fix:订阅搜索修改

jyBXSubscribe/rpc/model/push.go

@@ -357,8 +357,9 @@ func (s *subscribePush) Datas(spqp *SubPushQueryParam, bsp *ViewCondition) (hasN
 			}
 		}
 	} else if spqp.SelectTime != "" { //wx推送跳转过来
-		starttime, _ = strconv.ParseInt(spqp.SelectTime, 0, 64)
-		endtime = starttime
+		if sTime, _ := strconv.ParseInt(spqp.SelectTime, 0, 64); sTime > 0 {
+			starttime, endtime = sTime, sTime
+		}
 	}
 	//不活跃用户处理
 	if spqp.UserType == "fType" && spqp.PositionType == 0 && spqp.SubPushInactive == 1 {
@@ -514,12 +515,13 @@ func (s *subscribePush) inactiveQuery(spqp *SubPushQueryParam, bsp *ViewConditio
 					endtime = time.Now().AddDate(0, 0, -15).Unix()
 				}
 			}
-		} else if spqp.SelectTime != "" {
-			starttime, _ = strconv.ParseInt(spqp.SelectTime, 0, 64)
-			endtime = starttime
 		} else {
-			starttime = time.Now().AddDate(0, 0, -15).Unix()
-			endtime = time.Now().Unix()
+			if sTime, _ := strconv.ParseInt(spqp.SelectTime, 0, 64); sTime > 0 {
+				starttime, endtime = sTime, sTime
+			} else {
+				starttime = time.Now().AddDate(0, 0, -15).Unix()
+				endtime = time.Now().Unix()
+			}
 		}
 		qstr := s.getFreeDatasSQL(bsp, starttime, endtime, (spqp.PageNum-1)*spqp.PageSize, spqp.PageSize)
 		//list = elastic.GetAllByNgram(INDEX, TYPE, qstr, findfields, bidSort, bidField, 0, 4500, 0, false)