|
|
@@ -47,9 +47,6 @@ func (e *entnichePush) todayKey(userId int) string {
|
|
|
}
|
|
|
|
|
|
func (e *entnichePush) Datas(MQFW mg.MongodbSim, PushMysql *mysql.Mysql, userId int, pageNum int, selectTime, area string) (hasNextPage bool, result []*SubPushList) {
|
|
|
- if userId <= 0 {
|
|
|
- return
|
|
|
- }
|
|
|
if pageNum < 1 {
|
|
|
pageNum = 1
|
|
|
}
|
|
|
@@ -102,7 +99,7 @@ func (e *entnichePush) Datas(MQFW mg.MongodbSim, PushMysql *mysql.Mysql, userId
|
|
|
return
|
|
|
}
|
|
|
func (e *entnichePush) getDatasFromMysql(MQFW mg.MongodbSim, PushMysql *mysql.Mysql, userId int, pageNum, myPageSize int, selectTime, area string, isLimit bool) (result []*SubPushList) {
|
|
|
- findSQL := "select id,date,infoid,isvisit,matchkeys,type,1 as isvip from pushsubscribe where userid = " + fmt.Sprint(userId)
|
|
|
+ findSQL := "select id,date,infoid,isvisit,matchkeys,type,1 as isvip from pushentniche where userid = " + fmt.Sprint(userId)
|
|
|
findStr := ""
|
|
|
if selectTime != "" {
|
|
|
startTime := selectTime + " 00:00:00"
|
