Merge branch 'dm' of http://8.136.199.33:3000/eta_server/eta_api into dm

controllers/data_manage/edb_info.go

@@ -634,7 +634,7 @@ func (this *EdbInfoController) EdbInfoSearch() {
 				return
 			}
 			var zzInfo *data_manage.BaseInfoFromZz
-			if allInfo != nil {
+			if allInfo != nil && len(allInfo) > 0 {
 				zzInfo = allInfo[0]
 			}
 			if zzInfo != nil {
@@ -713,7 +713,7 @@ func (this *EdbInfoController) EdbInfoSearch() {
 				return
 			}
 			var dlInfo *data_manage.BaseInfoFromDl
-			if allInfo != nil {
+			if allInfo != nil && len(allInfo) > 0 {
 				dlInfo = allInfo[0]
 			}
 			if dlInfo != nil {
@@ -792,7 +792,7 @@ func (this *EdbInfoController) EdbInfoSearch() {
 				return
 			}
 			var shInfo *data_manage.BaseInfoFromSh
-			if allInfo != nil {
+			if allInfo != nil && len(allInfo) > 0 {
 				shInfo = allInfo[0]
 			}
 			if shInfo != nil {
@@ -871,7 +871,7 @@ func (this *EdbInfoController) EdbInfoSearch() {
 				return
 			}
 			var cffexInfo *data_manage.BaseInfoFromCffex
-			if allInfo != nil {
+			if allInfo != nil && len(allInfo) > 0 {
 				cffexInfo = allInfo[0]
 			}
 			if cffexInfo != nil {
@@ -950,7 +950,7 @@ func (this *EdbInfoController) EdbInfoSearch() {
 				return
 			}
 			var shfeInfo *data_manage.BaseInfoFromShfe
-			if allInfo != nil {
+			if allInfo != nil && len(allInfo) > 0 {
 				shfeInfo = allInfo[0]
 			}
 			if shfeInfo != nil {
@@ -1045,7 +1045,7 @@ func (this *EdbInfoController) EdbInfoSearch() {
 				return
 			}
 			var eicInfo *data_manage.BaseFromTradeEicIndexV2
-			if allInfo != nil {
+			if allInfo != nil && len(allInfo) > 0 {
 				eicInfo = allInfo[0]
 			}
 			var name string
@@ -1208,7 +1208,7 @@ func (this *EdbInfoController) EdbInfoSearch() {
 				return
 			}
 			var coalInfo *data_manage.BaseInfoFromCoal
-			if allInfo != nil {
+			if allInfo != nil && len(allInfo) > 0 {
 				coalInfo = allInfo[0]
 			}
 			if coalInfo != nil {

models/report/report_chapter_permission_mapping.go

@@ -9,7 +9,7 @@ import (
 // ReportChapterPermissionMapping
 // @Description: 报告章节的权限关系表
 type ReportChapterPermissionMapping struct {
-	ReportChapterPermissionMappingId int `orm:"column(report_chapter_permission_mapping_id)"`
+	ReportChapterPermissionMappingId int `orm:"column:report_chapter_permission_mapping_id;primaryKey"`
 	ReportChapterId                  int `description:"报告章节的id"` // 报告章节的id
 	ChartPermissionId                int `description:"权限id"`    // 权限id
 	CreateTime                       time.Time