Merge branch 'yb11.1' into debug

models/tables/chart_permission_search_key_word_mapping/query.go

@@ -58,4 +58,19 @@ func GetKeyWordsByChartPermissionIdOnly(charPermissionId int) (keyWords []string
 		}
 	}
 	return
+}
+
+// GetKeyWordsByChartPermissionByIds 根据权限ID， 查询二级分类名称
+func GetKeyWordsByChartPermissionByIds(charPermissionIds []int) (keyWords []string, err error)  {
+	var list []*ChartPermissionSearchKeyWordMapping
+	err = global.DEFAULT_MYSQL.Model(ChartPermissionSearchKeyWordMapping{}).Where("chart_permission_id IN (?) ", charPermissionIds).Scan(&list).Error
+	if err != nil && err != utils.ErrNoRow {
+		return
+	}
+	if len(list) > 0 {
+		for _, item := range list {
+			keyWords = append(keyWords, item.KeyWord)
+		}
+	}
+	return
 }

services/pc/classify.go

@@ -7,6 +7,7 @@ import (
 	"hongze/hongze_yb/models/response/pc"
 	"hongze/hongze_yb/models/tables/company_product"
 	"hongze/hongze_yb/models/tables/rddp/classify"
+	"hongze/hongze_yb/services/company"
 	"hongze/hongze_yb/services/user"
 	"hongze/hongze_yb/utils"
 	"sort"
@@ -96,12 +97,45 @@ func GetClassifyFirstList(user user.UserInfo) (resp pc.ClassifyFirstList, err er
 		}
 	}
 
+	// 获取有效的权限id列表
+	var validPermissionIdList []int
+	//var allClassifySecondIds []int
+	if productAuthOk {
+		validPermissionIdList, err = company.GetValidPermissionIdListByCompany2ProductId(user.CompanyID, 1)
+		if err != nil && err != utils.ErrNoRow {
+			errMsg = err.Error()
+			err = errors.New("查询分类出错")
+			return
+		}
+	}
+
+	//classifyNames, err := chart_permission_search_key_word_mapping.GetKeyWordsByChartPermissionByIds(validPermissionIdList)
+	//if err != nil {
+	//	errMsg = err.Error()
+	//	err = errors.New("查询权限对应的分类出错")
+	//	return
+	//}
+	//
+	//if len(classifyNames) > 0 {
+	//	allClassifySecondIds, err = classify.GetSecondIdsByClassifyNames(classifyNames)
+	//	if err != nil {
+	//		errMsg = err.Error()
+	//		err = errors.New("查询分类出错")
+	//		return
+	//	}
+	//}
+
 	for _, item := range list {
 		//无权限用户关闭品种类别入口
 		if item.RedirectType == 4 && !productAuthOk{
 			continue
 		}
 
+		//只有宏观经济权限的用户关闭品种类别入口
+		if len(validPermissionIdList) == 1 && validPermissionIdList[0] == 1 && item.RedirectType == 4{
+			continue
+		}
+
 		for _, report := range reportList {
 			if report.ClassifyNameFirst == item.ClassifyNameFirst {
 				item.Latest = report.Stage

services/report/classify.go

@@ -376,11 +376,45 @@ func GetClassifyFirstList(user user.UserInfo) (resp response.ClassifyFirstList,
 		}
 	}
 
+	// 获取有效的权限id列表
+	var validPermissionIdList []int
+	//var allClassifySecondIds []int
+	if productAuthOk {
+		validPermissionIdList, err = company.GetValidPermissionIdListByCompany2ProductId(user.CompanyID, 1)
+		if err != nil && err != utils.ErrNoRow {
+			errMsg = err.Error()
+			err = errors.New("查询分类出错")
+			return
+		}
+	}
+
+	//classifyNames, err := chart_permission_search_key_word_mapping.GetKeyWordsByChartPermissionByIds(validPermissionIdList)
+	//if err != nil {
+	//	errMsg = err.Error()
+	//	err = errors.New("查询权限对应的分类出错")
+	//	return
+	//}
+	//
+	//if len(classifyNames) > 0 {
+	//	allClassifySecondIds, err = classify.GetSecondIdsByClassifyNames(classifyNames)
+	//	if err != nil {
+	//		errMsg = err.Error()
+	//		err = errors.New("查询分类出错")
+	//		return
+	//	}
+	//}
 	for _, item := range list {
 		//无权限用户关闭品种类别入口
 		if item.RedirectType == 4 && !productAuthOk{
 			continue
 		}
+
+		//只有宏观经济权限的用户关闭品种类别入口
+		if len(validPermissionIdList) == 1 && validPermissionIdList[0] == 1 && item.RedirectType == 4{
+			continue
+		}
+
+
 		resp = append(resp, item)
 	}