Merge branch 'hotfix/forum_chart_description' into debug

controllers/smart_report/smart_report.go

@@ -393,7 +393,7 @@ func (this *SmartReportController) Detail() {
 		headResource, err := smart_report.GetResourceItemById(resp.HeadResourceId)
 		if err != nil && err.Error() != utils.ErrNoRow() {
 			br.Msg = "操作失败"
-			br.ErrMsg = "获取资源库版尾失败, Err: " + err.Error()
+			br.ErrMsg = "获取资源库版头失败, Err: " + err.Error()
 			return
 		}
 		if headResource != nil && headResource.ResourceId > 0 {
@@ -406,7 +406,7 @@ func (this *SmartReportController) Detail() {
 		endResource, err := smart_report.GetResourceItemById(resp.EndResourceId)
 		if err != nil && err.Error() != utils.ErrNoRow() {
 			br.Msg = "操作失败"
-			br.ErrMsg = "获取资源库版头失败, Err: " + err.Error()
+			br.ErrMsg = "获取资源库版尾失败, Err: " + err.Error()
 			return
 		}
 		if endResource != nil && endResource.ResourceId > 0 {

services/eta_forum/eta_forum_hub.go

@@ -1054,7 +1054,7 @@ func getChartDescriptionWithAdminNameByChartInfoId(chartInfoId int) (list []*dat
 	}
 	adminMap := make(map[int]string)
 	for _, v := range adminList {
-		adminMap[v.AdminId] = v.AdminName
+		adminMap[v.AdminId] = v.RealName
 	}
 	for _, v := range descriptionList {
 		adminName, ok := adminMap[v.SysUserId]