处理细节问题

models/response/purchase/purchase.go

@@ -18,7 +18,6 @@ type DetailResp struct {
 
 type Detail struct {
 	item
-	ImgUrl    string   `description:"背景图地址" json:"img_url"`
 	TopName         string   `description:"主标题" json:"top_name"`
 }
 
@@ -33,6 +32,7 @@ type item struct {
 	Content            string `description:"简介" json:"content"`
 	Stage              int	  `description:"期数" json:"stage"`
 	Time               time.Time `description:"更新时间" json:"time"`
+	ImgUrl             string   `description:"背景图地址" json:"img_url"`
 }
 
 type PurchaseList []*PurchaseListItem

models/tables/chart_permission/query.go

@@ -14,7 +14,7 @@ func GetListByProductId(productId int64) (list []*ChartPermission, err error) {
 
 // GetFiccListExceptTacticByProductId 获取ficc 除了市场策略的所有权限
 func GetFiccListExceptTacticByProductId() (list []*ChartPermission, err error)  {
-	err = global.DEFAULT_MYSQL.Where(" product_id = 1 and classify_name != '市场策略'").Find(&list).Error
+	err = global.DEFAULT_MYSQL.Where(" enabled = 1 AND permission_type = 0 AND product_id = 1 and classify_name != '市场策略'").Find(&list).Error
 	return
 }
 // GetClassNameListByProductId 根据权限id获取权限分类

models/tables/rddp/classify/classify.go

@@ -3,24 +3,28 @@ package classify
 import "time"
 
 type Classify struct {
-	Id               int  	`gorm:"primaryKey;column:id;type:int(10) unsigned;not null" json:"-"`
-	ClassifyName     string `gorm:"column:classify_name" json:"classify_name"`
-	Sort			 int8
-	ParentId		 int
-	CreateTime       time.Time
-	ModifyTime       time.Time
-	Abstract         string
-	Descript         string
-	ReportAuthor     string
-	AuthorDescript   string
-	ReportImgUrl     string
-	HeadImgUrl       string
-	AvatarImgUrl     string
-	ColumnImgUrl     string
-	IsHomeColumn     int8
-	HomeImgUrl       string
-	ClassifyLabel    string
-	IsVip            int
+	Id int `gorm:"column:id" db:"id" json:"id" form:"id"`
+	ClassifyName string `gorm:"column:classify_name" db:"classify_name" json:"classify_name" form:"classify_name"` //分类名称
+	Sort int8 `gorm:"column:sort" db:"sort" json:"sort" form:"sort"` //排序
+	ParentId int `gorm:"column:parent_id" db:"parent_id" json:"parent_id" form:"parent_id"` //父级分类id
+	CreateTime time.Time `gorm:"column:create_time" db:"create_time" json:"create_time" form:"create_time"`
+	ModifyTime time.Time `gorm:"column:modify_time" db:"modify_time" json:"modify_time" form:"modify_time"`
+	Abstract string `gorm:"column:abstract" db:"abstract" json:"abstract" form:"abstract"` //栏目简介
+	Descript string `gorm:"column:descript" db:"descript" json:"descript" form:"descript"` //分享描述
+	ReportAuthor string `gorm:"column:report_author" db:"report_author" json:"report_author" form:"report_author"` //栏目作者
+	AuthorDescript string `gorm:"column:author_descript" db:"author_descript" json:"author_descript" form:"author_descript"` //作者简介
+	ReportImgUrl string `gorm:"column:report_img_url" db:"report_img_url" json:"report_img_url" form:"report_img_url"` //报告配图
+	HeadImgUrl string `gorm:"column:head_img_url" db:"head_img_url" json:"head_img_url" form:"head_img_url"` //头部banner
+	AvatarImgUrl string `gorm:"column:avatar_img_url" db:"avatar_img_url" json:"avatar_img_url" form:"avatar_img_url"` //头像
+	ColumnImgUrl string `gorm:"column:column_img_url" db:"column_img_url" json:"column_img_url" form:"column_img_url"` //栏目配图
+	IsHomeColumn int8 `gorm:"column:is_home_column" db:"is_home_column" json:"is_home_column" form:"is_home_column"` //1:首页专栏
+	HomeImgUrl string `gorm:"column:home_img_url" db:"home_img_url" json:"home_img_url" form:"home_img_url"` //首页配图
+	ClassifyLabel string `gorm:"column:classify_label" db:"classify_label" json:"classify_label" form:"classify_label"`
+	ShowType uint8 `gorm:"column:show_type" db:"show_type" json:"show_type" form:"show_type"` //展示类型：1-列表 2-专栏
+	HasTeleconference uint8 `gorm:"column:has_teleconference" db:"has_teleconference" json:"has_teleconference" form:"has_teleconference"` //是否有电话会 0-否 1-是
+	IsVip int8 `gorm:"column:is_vip" db:"is_vip" json:"is_vip" form:"is_vip"` //1:是VIP客户，0不是VIP
+	YbIconUrl string `gorm:"column:yb_icon_url" db:"yb_icon_url" json:"yb_icon_url" form:"yb_icon_url"` //研报3.0已购页面icon图片地址
+	YbBgUrl string `gorm:"column:yb_bg_url" db:"yb_bg_url" json:"yb_bg_url" form:"yb_bg_url"` //研报3.0已购详情背景图地址
 }
 
 func (c *Classify) TableName() string  {

services/company/permission.go

@@ -645,6 +645,13 @@ func GetHomeFiccPermissions(user user.UserInfo) (list response.PermissionFiccLis
 		temp := new(response.PermissionFiccItem)
 		temp.Sort = v.Sort
 		temp.ClassifyName = k
+		if temp.ClassifyName == "化工产业" {
+			temp.ClassifyName = "化工"
+		}else if temp.ClassifyName == "黑色产业" {
+			temp.ClassifyName = "黑色"
+		}else if temp.ClassifyName == "有色产业" {
+			temp.ClassifyName = "有色"
+		}
 		if len(v.List) > 0 {
 			temp.List = v.List
 			sort.Sort(temp.List)