Merge branch 'eta_0730_bug_1119@guomengyuan' into debug

# Conflicts:
#	services/data/data_manage_permission/edb_permission.go

controllers/report_chapter_type.go

@@ -161,6 +161,7 @@ func (this *ReportChapterTypeController) Add() {
 	item.IsSet = 0
 	item.ReportChapterTypeKey = req.ReportChapterTypeName
 	item.TickerTitle = req.ReportChapterTypeName
+	item.IsShow = 1
 
 	if e = item.Create(); e != nil {
 		br.Msg = "操作失败"

services/data/data_manage_permission/edb_permission.go

@@ -54,6 +54,7 @@ func SetEdbChartPermission(source, subSource, userId int, authUserList []int, is
 	// dataIdList 做3000条限制
 	if len(dataIdList) > 3000 {
 		err = fmt.Errorf("数据量条数不要超过3000，请分批设置")
+		errMsg = err.Error()
 		return
 	}