Merge branch 'cygx_12.0.1' of http://8.136.199.33:3000/hongze/hongze_cygx into debug

controllers/yanxuan_special.go

@@ -899,7 +899,7 @@ func (this *YanxuanSpecialController) AuthorList() {
 	startSize = utils.StartIndex(currentIndex, pageSize)
 	var condition string
 	var pars []interface{}
-	condition += ` AND  a.nick_name <> '' `
+	condition += ` AND  a.nick_name <> ''   `
 
 	total, err := models.GetCygxYanxuanSpecialAuthorCount(condition, pars)
 	if err != nil {

services/cygx_yanxuan_special.go

@@ -343,7 +343,7 @@ func GetBestNewYanxuanSpecialByUserId(userIds []int) (mapResp map[int]*models.Cy
 	}()
 	var condition string
 	var pars []interface{}
-	condition += ` AND user_id  IN (` + utils.GetOrmInReplace(lenArr) + `) AND status = 3  GROUP BY user_id ORDER BY publish_time DESC`
+	condition += `  AND  a.publish_time = ( SELECT max( b.publish_time ) FROM cygx_yanxuan_special b WHERE a.user_id = b.user_id )  AND user_id  IN (` + utils.GetOrmInReplace(lenArr) + `) AND a.status = 3  GROUP BY user_id ORDER BY publish_time DESC`
 	pars = append(pars, userIds)
 	list, e := models.GetYanxuanSpecialListBycondition(condition, pars, 0, lenArr)
 	if e != nil && e.Error() != utils.ErrNoRow() {