Merge branch 'need_Clei_kejian' of http://8.136.199.33:3000/hongze/hongze_cygx into debug

models/article.go

@@ -263,9 +263,8 @@ func GetArticleAll() (item []*ArticleDetail, err error) {
 }
 func GetArticleAllDate(endDate string) (item []*ArticleDetail, err error) {
 	o := orm.NewOrm()
-	sql := `SELECT * FROM cygx_article WHERE is_summary=1 AND publish_date >= ? AND  article_id = 7297  `
-	sql = `SELECT * FROM cygx_article WHERE article_id = ?  `
-	_, err = o.Raw(sql, 7297).QueryRows(&item)
+	sql := `SELECT * FROM cygx_article WHERE is_summary=1 AND publish_date >= ?   `
+	_, err = o.Raw(sql, endDate).QueryRows(&item)
 	return
 }
 

models/seller.go

@@ -61,7 +61,6 @@ func GetSelleridWhichGroup(companyId, productId int) (adminId string, err error)
 			FROM
 			company_product AS a
 			INNER JOIN admin AS b ON a.seller_id = b.admin_id
-			INNER JOIN wx_user AS c ON b.mobile = c.mobile
 			WHERE
 			a.company_id = ?
 			AND a.product_id = ?