Merge branch 'yb/5.0' into debug

services/company/permission.go

@@ -614,9 +614,6 @@ func GetFiccPermissionList() (list []*FiccPermissionList, err error) {
 	productId := 1
 	list = make([]*FiccPermissionList, 0)
 	for _, v := range utils.PermissionFiccClassifyArr {
-		if v == "市场策略" {
-			continue
-		}
 		classify := new(FiccPermissionList)
 		classify.ClassifyName = v
 		items, e := chart_permission.GetListByProductIdAndClassifyName(productId, v)

utils/constants.go

@@ -100,7 +100,7 @@ const (
 	EDB_DATA_LIMIT = 10
 )
 
-var PermissionFiccClassifyArr = [...]string{"宏观经济", "化工产业", "黑色产业", "有色产业", "市场策略"}
+var PermissionFiccClassifyArr = [...]string{"宏观经济", "化工产业", "建材产业", "有色产业"}
 
 //缓存key
 const (