fix：分类异常，与继承的报告分类不一致的bug修复

controllers/report_v2.go

@@ -1024,7 +1024,7 @@ func (this *ReportController) BaseDetail() {
 			for _, v := range adminList {
 				permissionList = append(permissionList, models.ReportDetailViewPermission{
 					PermissionId:   v.ChartPermissionId,
-					PermissionName: v.ChartPermissionName,
+					PermissionName: v.PermissionName,
 				})
 			}
 		}

models/permission.go

@@ -105,6 +105,7 @@ func UpdateChartPermissionNameFromMappingByKeyword(newKeyword string, classifyId
 type ChartPermissionSearchKeyWordMappingAndPermissionName struct {
 	ChartPermissionId   int    `description:"权限id"`
 	ChartPermissionName string `description:"权限名称"`
+	PermissionName      string `description:"权限名称"`
 	KeyWord             string `description:"二级分类名称"`
 	ClassifyId          int    `description:"分类ID"`
 }
@@ -118,7 +119,7 @@ type ChartPermissionSearchKeyWordMappingAndPermissionName struct {
 // @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 
+	sql := `SELECT a.chart_permission_name,a.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/classify.go

@@ -418,9 +418,10 @@ func checkClassifyApprove(currClassify *models.Classify) (err error, errMsg stri
 		if e != nil {
 			// 父级分类如果没有审批流，那么就正常进行就好了
 			if e.Error() != utils.ErrNoRow() {
+				err = errors.New("获取审批流是否已存在失败, Err: " + e.Error())
 				return
 			}
-			err = errors.New("获取审批流是否已存在失败, Err: " + e.Error())
+			err = nil
 			return
 		}
 		if flowItem == nil {

services/report_v2.go

@@ -64,7 +64,7 @@ func AddReportAndChapter(reportInfo *models.Report, inheritReportId int, grantAd
 			// 判断当前的报告分类与继承的报告分类是否一致
 			if inheritReport.ClassifyIdFirst != reportInfo.ClassifyIdFirst || inheritReport.ClassifyIdSecond != reportInfo.ClassifyIdSecond || inheritReport.ClassifyIdThird != reportInfo.ClassifyIdThird {
 				errMsg = "分类异常，与继承的报告分类不一致"
-				err = tmpErr
+				err = errors.New(errMsg)
 				return
 			}