|
@@ -474,7 +474,7 @@ type CygxActivityLabelList struct {
|
|
|
//主题列表
|
|
|
func GetActivityLabelListAll(condition, sortTime string, pars []interface{}, startSize, pageSize int) (items []*CygxActivityLabelList, err error) {
|
|
|
o := orm.NewOrm()
|
|
|
- sql := `SELECT label, MAX( art.activity_time ) AS timesort, MIn( art.activity_time ) AS mintimesort
|
|
|
+ sql := `SELECT label,is_show_subject_name, MAX( art.activity_time ) AS timesort, MIn( art.activity_time ) AS mintimesort
|
|
|
FROM cygx_activity as art WHERE 1= 1 `
|
|
|
if condition != "" {
|
|
|
sql += condition
|
|
@@ -567,7 +567,7 @@ func GetAskEmail() (item []*AskEmailRep, err error) {
|
|
|
//主题列表
|
|
|
func GetActivityLabelSpecialListAll(condition string, pars []interface{}, startSize, pageSize int) (items []*CygxActivityLabelList, err error) {
|
|
|
o := orm.NewOrm()
|
|
|
- sql := `SELECT label,activity_id
|
|
|
+ sql := `SELECT label,activity_id,is_show_subject_name
|
|
|
FROM cygx_activity_special as art WHERE 1= 1 `
|
|
|
if condition != "" {
|
|
|
sql += condition
|