Merge branch 'cygx_10.2' of http://8.136.199.33:3000/hongze/hongze_cygx into debug

models/activity.go

@@ -996,7 +996,8 @@ func AddCygxActivity(item *CygxActivity) (lastId int64, err error) {
 // 列表
 func GetActivityListByYidong(condition string) (items []*ActivityDetail, err error) {
 	o := orm.NewOrm()
-	sql := `SELECT * FROM cygx_activity WHERE yidong_activity_id != '' OR   yidong_activity_id_by_cygx  != '' `
+	sql := `SELECT * FROM cygx_activity WHERE 1 = 1 
+	AND ( yidong_activity_id != '' OR yidong_activity_id_by_cygx != '' )  `
 	if condition != "" {
 		sql += condition
 	}

services/activity.go

@@ -1689,6 +1689,7 @@ func ActivityButtonShow(item *models.ActivityDetail) (articleDetail *models.Acti
 	articleDetail.IsShowAppointment = false
 	//易董的操作按钮都隐藏
 	if articleDetail.YidongActivityId != "" {
+		articleDetail.SourceType = 1
 		articleDetail.IsShowSignup = false
 		articleDetail.IsShowDetails = true
 		return