行业分类优化

controllers/activity.go

@@ -1654,6 +1654,7 @@ func (this *ActivityCoAntroller) LabelList() {
 
 	//主题
 	if label != "" {
+		condition += ` AND art.active_state = 1 `
 		listAll, errList := models.GetActivityLabelListAll(condition, pars, startSize, 32)
 		if errList != nil {
 			br.Msg = "获取失败"

models/chart_permission.go

@@ -50,7 +50,7 @@ func GetChartPermissionById(chartPermissionId int) (item *ChartPermission, err e
 
 func GetChartPermissionActivity() (items []*ActivityChartPermission, err error) {
 	o := orm.NewOrm()
-	sql := `SELECT * FROM chart_permission WHERE chart_permission_id IN (19,20,21,22,23) ORDER BY sort ASC `
+	sql := `SELECT * FROM chart_permission WHERE chart_permission_id IN (19,20,21,22,23,31) ORDER BY sort ASC `
 	_, err = o.Raw(sql).QueryRows(&items)
 	return
 }
@@ -67,7 +67,7 @@ func GetUserCompanyPermission(companyId int) (items []*ActivityChartPermission,
             AND b.is_other=0
 			AND c.status IN('正式','试用','永续')
 			AND a.status IN('正式','试用','永续') 
-			AND b.chart_permission_id IN (19,20,21,22,23) 
+			AND b.chart_permission_id IN (19,20,21,22,23,31) 
 			ORDER BY b.sort ASC `
 	o := orm.NewOrm()
 	_, err = o.Raw(sql, companyId).QueryRows(&items)