fix:研报分类-权限列表（列表形式）接口，新增返回品种名称

controllers/classify.go

@@ -546,7 +546,7 @@ func (this *ClassifyController) ClassifyPermission() {
 	}
 
 	//获取报告分类权限列表
-	list, err := models.GetPermission(classifyInfo.Id)
+	list, err := models.GetPermissionByClassifyId(classifyInfo.Id)
 	if err != nil {
 		br.Msg = "获取分类信息失败"
 		br.ErrMsg = "获取失败，Err:" + err.Error()

models/permission.go

@@ -99,3 +99,27 @@ func UpdateChartPermissionNameFromMappingByKeyword(newKeyword string, classifyId
 	_, err = o.Raw(sql, newKeyword, classifyId, source).Exec()
 	return
 }
+
+// ChartPermissionSearchKeyWordMappingAndPermissionName
+// @Description: 分类关联品种
+type ChartPermissionSearchKeyWordMappingAndPermissionName struct {
+	ChartPermissionId   int    `description:"权限id"`
+	ChartPermissionName string `description:"权限名称"`
+	KeyWord             string `description:"二级分类名称"`
+	ClassifyId          int    `description:"分类ID"`
+}
+
+// GetPermissionByClassifyId
+// @Description: 根据分类id获取关联的报告权限
+// @author: Roc
+// @datetime 2024-06-19 14:56:44
+// @param classifyId int
+// @return items []*ChartPermissionSearchKeyWordMappingAndPermissionName
+// @return err error
+func GetPermissionByClassifyId(classifyId int) (items []*ChartPermissionSearchKeyWordMappingAndPermissionName, err error) {
+	o := orm.NewOrmUsingDB("rddp")
+	sql := `SELECT a.chart_permission_name,b.chart_permission_id,b.key_word,b.classify_id FROM chart_permission AS a 
+ join chart_permission_search_key_word_mapping AS b ON a.chart_permission_id=b.chart_permission_id WHERE b.from='rddp' AND b.classify_id = ? `
+	_, err = o.Raw(sql, classifyId).QueryRows(&items)
+	return
+}

services/report.go

@@ -346,6 +346,13 @@ func addCategoryAliasToArr(categoryArr []string) (aliasArr []string, err error)
 // UpdateReportChapterEs 更新报告章节ES
 func UpdateReportChapterEs(reportChapterId int) (err error) {
 	// TODO 报告章节ES的权限控制
+	// TODO 弘则得单独处理晨报的权限
+	//if utils.BusinessCode != utils.BusinessCodeRelease && utils.BusinessCode != utils.BusinessCodeSandbox && utils.BusinessCode != utils.BusinessCodeDebug {
+	//	br.Ret = 200
+	//	br.Success = true
+	//	br.Msg = "操作成功"
+	//	return
+	//}
 	if reportChapterId <= 0 {
 		return
 	}

services/report_v2.go

@@ -306,14 +306,6 @@ func getAddChapter(reportInfo *models.Report, minClassifyId, inheritReportId int
 		minClassifyName = reportInfo.ClassifyNameFirst
 	}
 
-	// TODO 弘则得单独处理启用禁用的情况
-	//if utils.BusinessCode != utils.BusinessCodeRelease && utils.BusinessCode != utils.BusinessCodeSandbox && utils.BusinessCode != utils.BusinessCodeDebug {
-	//	br.Ret = 200
-	//	br.Success = true
-	//	br.Msg = "操作成功"
-	//	return
-	//}
-
 	errMsg = "生成报告章节失败"
 	// 章节类型列表
 	allTypeList, err := models.GetReportChapterTypeListByClassifyId(minClassifyId)