合并与debug分支的冲突

controllers/chart_permission.go

@@ -122,10 +122,7 @@ func (this *ChartPermissionAuthController) ReportDetail() {
 			}
 		}
 	}
-
-	if userType == 1 {
-		condition += ` AND permission_name  != '买方研选'`
-	}
+	condition += ` AND permission_name  != '买方研选'`
 	list, err := models.GetChartPermissionReportAll(condition)
 	if err != nil {
 		br.Msg = "获取信息失败"

models/activity_type.go

@@ -72,7 +72,7 @@ func GetActivityTypeHomeList() (items []*ActivityTypeHome, err error) {
 //列表
 func GetActivityTypeHomeListPc() (items []*ActivityTypeHomePc, err error) {
 	o := orm.NewOrm()
-	sql := `SELECT * FROM cygx_activity_type ORDER BY sort DESC`
+	sql := `SELECT * FROM cygx_activity_type WHERE activity_type_id != 7   ORDER BY sort DESC`
 	_, err = o.Raw(sql).QueryRows(&items)
 	return
 }