用户搜索记录完善

controllers/activity.go

@@ -535,7 +535,18 @@ func (this *ActivityCoAntroller) GetUserSearchContent() {
 			}
 		}
 	}
-	listChartPermissionid, errChart := models.GetChartPermissionActivity()
+	var listChartPermissionid []*models.ActivityChartPermission
+	var errChart error
+	if isShowJurisdiction == 0 {
+		listChartPermissionidAll, errChartAll := models.GetChartPermissionActivity()
+		listChartPermissionid = listChartPermissionidAll
+		errChart = errChartAll
+	} else {
+		listChartPermissionidAll, errChartAll := models.GetUserCompanyPermission(user.CompanyId)
+		listChartPermissionid = listChartPermissionidAll
+		errChart = errChartAll
+	}
+
 	if errChart != nil {
 		br.Msg = "获取信息失败"
 		br.ErrMsg = "获取品种信息失败,Err:" + errChart.Error()

models/chart_permission.go

@@ -54,3 +54,20 @@ func GetChartPermissionActivity() (items []*ActivityChartPermission, err error)
 	_, err = o.Raw(sql).QueryRows(&items)
 	return
 }
+
+func GetUserCompanyPermission(companyId int) (items []*ActivityChartPermission, err error) {
+	sql := ` SELECT b.*
+			FROM company_report_permission AS a
+			INNER JOIN chart_permission AS b ON a.chart_permission_id=b.chart_permission_id
+			INNER JOIN company_product AS c ON a.company_id=c.company_id AND a.product_id=c.product_id
+			WHERE  a.company_id=?
+			AND a.product_id=2
+			AND c.is_suspend=0
+            AND b.is_report=1
+            AND b.is_other=0
+			AND c.status IN('正式','试用','永续')
+			AND a.status IN('正式','试用','永续') `
+	o := orm.NewOrm()
+	_, err = o.Raw(sql, companyId).QueryRows(&items)
+	return
+}