品种权限统一

controllers/classify.go

@@ -7,7 +7,6 @@ import (
 	"eta/eta_api/services"
 	"eta/eta_api/utils"
 	"fmt"
-	"github.com/rdlucklib/rdluck_tools/paging"
 	"time"
 )
 
@@ -733,8 +732,7 @@ func (this *ClassifyController) ListClassify() {
 		this.Data["json"] = br
 		this.ServeJSON()
 	}()
-	pageSize, _ := this.GetInt("PageSize")
-	currentIndex, _ := this.GetInt("CurrentIndex")
+
 	keyWord := this.GetString("KeyWord")
 	companyType := this.GetString("CompanyType")
 	hideDayWeek, _ := this.GetInt("HideDayWeek")
@@ -743,22 +741,7 @@ func (this *ClassifyController) ListClassify() {
 		hideDayWeek = 0
 	}
 
-	var startSize int
-	if pageSize <= 0 {
-		pageSize = utils.PageSize20
-	}
-	if currentIndex <= 0 {
-		currentIndex = 1
-	}
-
-	startSize = utils.StartIndex(currentIndex, pageSize)
-	list, err := models.GetClassifyList(startSize, pageSize, keyWord, companyType, hideDayWeek)
-	if err != nil {
-		br.Msg = "获取失败"
-		br.ErrMsg = "获取失败，Err:" + err.Error()
-		return
-	}
-	total, err := models.GetClassifyListCount(keyWord, companyType, hideDayWeek)
+	list, err := models.GetClassifyList(keyWord, companyType, hideDayWeek)
 	if err != nil {
 		br.Msg = "获取失败"
 		br.ErrMsg = "获取失败，Err:" + err.Error()
@@ -772,8 +755,7 @@ func (this *ClassifyController) ListClassify() {
 	parentIdLen := len(parentIds)
 	if parentIdLen == 0 {
 		resp := &models.ClassifyListResp{
-			List:   list,
-			Paging: paging.GetPaging(currentIndex, pageSize, 0),
+			List: list,
 		}
 		br.Data = resp
 		br.Ret = 200
@@ -863,10 +845,8 @@ func (this *ClassifyController) ListClassify() {
 		list[i].Child = childrenMap[list[i].Id]
 	}
 
-	page := paging.GetPaging(currentIndex, pageSize, total)
 	resp := new(models.ClassifyListResp)
 	resp.List = list
-	resp.Paging = page
 	br.Data = resp
 	br.Ret = 200
 	br.Success = true

controllers/english_report/en_permission.go

@@ -277,6 +277,8 @@ func (this *EnPermissionController) List() {
 	keyword := this.GetString("Keyword", "")
 	keyword = strings.TrimSpace(keyword)
 
+	enabled, _ := this.GetInt("Enabled", -1)
+
 	// 禁用指定报告、指定路演无权限的品种
 	reportId, _ := this.GetInt("ReportId", 0)
 	videoId, _ := this.GetInt("VideoId", 0)
@@ -332,6 +334,9 @@ func (this *EnPermissionController) List() {
 			continue
 		}
 		if v.ParentId > 0 {
+			if v.Enabled == 0 && enabled == 1 {
+				continue
+			}
 			if childMap[v.ParentId] == nil {
 				childMap[v.ParentId] = make([]*models.EnPermissionItem, 0)
 			}
@@ -346,6 +351,7 @@ func (this *EnPermissionController) List() {
 		r.Child = childMap[r.PermissionId]
 	}
 
+	// todo 过滤禁用品种的一级分类，如果一级分类没有二级分类
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "获取成功"

models/classify.go

@@ -204,8 +204,7 @@ type ClassifyItem struct {
 }
 
 type ClassifyListResp struct {
-	List   []*ClassifyList
-	Paging *paging.PagingItem `description:"分页数据"`
+	List []*ClassifyList
 }
 
 type ClassifyPermissionListResp struct {
@@ -214,7 +213,7 @@ type ClassifyPermissionListResp struct {
 }
 
 // 获取分类列表
-func GetClassifyList(startSize, pageSize int, keyWord, companyType string, hideDayWeek int) (items []*ClassifyList, err error) {
+func GetClassifyList(keyWord, companyType string, hideDayWeek int) (items []*ClassifyList, err error) {
 	sql := ``
 	companyTypeSqlStr := ``
 	if companyType == "ficc" {
@@ -232,17 +231,16 @@ func GetClassifyList(startSize, pageSize int, keyWord, companyType string, hideD
                    WHERE id IN( SELECT parent_id FROM classify
                    WHERE parent_id>0 ` + companyTypeSqlStr + `  AND classify_name LIKE ? )
                    )AS t
-                   ORDER BY sort ASC,create_time ASC
-                   LIMIT ?,? `
+                   ORDER BY sort ASC,create_time ASC`
 		pars = utils.GetLikeKeywordPars(pars, keyWord, 2)
 	} else {
 		sql = `SELECT * FROM classify WHERE parent_id=0 ` + companyTypeSqlStr
 		if hideDayWeek == 1 {
 			sql += ` AND classify_name <> '晨报' AND classify_name <> '周报' `
 		}
-		sql += ` ORDER BY sort ASC, create_time ASC LIMIT ?,? `
+		sql += ` ORDER BY sort ASC, create_time ASC`
 	}
-	pars = append(pars, startSize, pageSize)
+	pars = append(pars)
 
 	o := orm.NewOrmUsingDB("rddp")
 	_, err = o.Raw(sql, pars...).QueryRows(&items)

models/company/company_permission.go

@@ -37,15 +37,15 @@ type PermissionSetItemType struct {
 }
 
 type PermissionSetList struct {
-	ClassifyName string `description:"分类"`
-	Items        []*PermissionSetItem
-	CheckList    []int
+	PermissionName string `description:"分类"`
+	Child          []*PermissionSetItem
+	CheckList      []int
 }
 
 type PermissionSetListType struct {
-	ClassifyName string `description:"分类"`
-	Items        []*PermissionSetItemType
-	CheckList    []int
+	PermissionName string `description:"分类"`
+	Child          []*PermissionSetItemType
+	CheckList      []int
 }
 
 type PermissionSetResp struct {

services/chart_permission.go

@@ -257,8 +257,8 @@ func GetChartPermissionEnabledList() (list []*company.PermissionSetList, err err
 		}
 		checkList := make([]int, 0)
 		p := new(company.PermissionSetList)
-		p.ClassifyName = v.PermissionName
-		p.Items = items
+		p.PermissionName = v.PermissionName
+		p.Child = items
 		if v.PermissionName == "宏观经济" {
 			checkList = append(checkList, 1)
 		}