Merge remote-tracking branch 'origin/yb/1.1'

logic/report/research_report.go

@@ -35,6 +35,8 @@ func GetResearchReportInfo(researchReportId, userId uint64) (result ResearchRepo
 			//}
 			return
 		}
+	} else {
+		hasPermission = true
 	}
 
 	researchReportTypeList := make([]*company_report_permission.ResearchReportTypeList, 0)

models/tables/company_report_permission/custom_query.go

@@ -50,7 +50,7 @@ type ResearchReportTypeList struct {
 	LastUpdatedTime         time.Time
 }
 
-// 获取研究报告的章节详情
+// GetResearchReportType 获取研究报告的章节详情
 func GetResearchReportType(researchReportId, userId uint64, reportType string) (list []*ResearchReportTypeList, err error) {
 	var condition string
 	whereVals := make([]interface{}, 0)

models/tables/research_report/custom_query.go

@@ -17,8 +17,8 @@ type ResearchReportTypeContent struct {
 	LastUpdatedTime             time.Time `json:"last_updated_time" description:"最近一次更新时间"`
 }
 
-//获取研究报告章节详情
-func GetResearchReportTypeContent(researchReportTypeId int) (items []*ResearchReportTypeContent, err error) {
+// GetResearchReportTypeContent 获取研究报告章节详情
+func GetResearchReportTypeContent(researchReportTypeId uint64) (items []*ResearchReportTypeContent, err error) {
 	sql := `select rrt.research_report_type_title,rrtc.*,rrt.research_report_type_id
 from research_report_type rrt
 inner join research_report_type_content rrtc on rrtc.research_report_type_id = rrt.research_report_type_id