Browse Source

首页分类查寻,后台添加的纪要筛选

xingzai 3 years ago
parent
commit
30e834422b
2 changed files with 28 additions and 14 deletions
  1. 8 1
      controllers/home.go
  2. 20 13
      models/chart_permission.go

+ 8 - 1
controllers/home.go

@@ -50,6 +50,12 @@ func (this *HomeController) ListHome() {
 			br.ErrMsg = "获取分类权限信息失败,Err:" + err.Error()
 			return
 		}
+		categoryinfo, err := models.GetChartPermissionById(chartPermissionId)
+		if err != nil {
+			br.Msg = "获取信息失败"
+			br.ErrMsg = "获取信息失败,Err:" + err.Error()
+			return
+		}
 		page = paging.GetPaging(currentIndex, pageSize, total)
 		if categoryId == "" {
 			list := make([]*models.HomeArticle, 0)
@@ -62,8 +68,9 @@ func (this *HomeController) ListHome() {
 			return
 		}
 		condition = ` AND category_id IN(` + categoryId + `)`
+		condition = ` OR  category_name = '` + categoryinfo.PermissionName + `'`
 	}
-	condition += ` AND is_summary = 1 `
+	condition += ` AND is_summary = 1  `
 	//condition = ` AND a.category_id NOT IN (85,71) `
 
 	total, err := models.GetHomeCount(condition, pars)

+ 20 - 13
models/chart_permission.go

@@ -3,8 +3,8 @@ package models
 import "rdluck_tools/orm"
 
 type ChartPermission struct {
-	ChartPermissionId   int       `description:"权限id"`
-	PermissionName      string    `description:"权限名称"`
+	ChartPermissionId int    `description:"权限id"`
+	PermissionName    string `description:"权限名称"`
 }
 
 type ChartPermissionResp struct {
@@ -12,25 +12,32 @@ type ChartPermissionResp struct {
 }
 
 func GetChartPermissionAll() (items []*ChartPermission, err error) {
-	o:=orm.NewOrm()
-	sql:=`SELECT * FROM chart_permission WHERE product_id=2 AND show_type=1 ORDER BY sort ASC `
-	_,err=o.Raw(sql).QueryRows(&items)
+	o := orm.NewOrm()
+	sql := `SELECT * FROM chart_permission WHERE product_id=2 AND show_type=1 ORDER BY sort ASC `
+	_, err = o.Raw(sql).QueryRows(&items)
 	return
 }
 
-func GetCategoryId(chartPermissionId int)(category_id string,err error) {
-	o:=orm.NewOrm()
-	sql:=` SELECT GROUP_CONCAT(a.category_id) AS category_id 
+func GetCategoryId(chartPermissionId int) (category_id string, err error) {
+	o := orm.NewOrm()
+	sql := ` SELECT GROUP_CONCAT(a.category_id) AS category_id 
 			FROM cygx_permission_mapping AS a
 			WHERE a.chart_permission_id=? 
 			GROUP BY a.chart_permission_id `
-	err=o.Raw(sql,chartPermissionId).QueryRow(&category_id)
+	err = o.Raw(sql, chartPermissionId).QueryRow(&category_id)
 	return
 }
 
 func GetChartPermissionReportAll() (items []*ChartPermission, err error) {
-	o:=orm.NewOrm()
-	sql:=`SELECT * FROM chart_permission WHERE product_id=2 AND is_report=1 ORDER BY sort ASC `
-	_,err=o.Raw(sql).QueryRows(&items)
+	o := orm.NewOrm()
+	sql := `SELECT * FROM chart_permission WHERE product_id=2 AND is_report=1 ORDER BY sort ASC `
+	_, err = o.Raw(sql).QueryRows(&items)
 	return
-}
+}
+
+func GetChartPermissionById(chartPermissionId int) (item *ChartPermission, err error) {
+	o := orm.NewOrm()
+	sql := `SELECT * FROM chart_permission WHERE chart_permission_id = ? `
+	err = o.Raw(sql, chartPermissionId).QueryRow(&item)
+	return
+}