新增创建者和上传者信息

controllers/data_manage/chart_info.go

@@ -3885,7 +3885,7 @@ func (this *ChartInfoController) UploadToForum() {
 		return
 	}
 
-	err, errMsg := eta_forum.UploadChart(req.ChartInfoId, req.Description)
+	err, errMsg := eta_forum.UploadChart(req.ChartInfoId, req.Description, sysUser)
 	if err != nil {
 		br.Msg = errMsg
 		br.ErrMsg = err.Error()

services/eta_forum/eta_forum_hub.go

@@ -27,6 +27,8 @@ type ChartSaveLibReq struct {
 	EdbInfoDataList         []*AddEdbDataReq
 	ChartEdbMapping         []*data_manage.ChartEdbMapping
 	EdbInfoCalculateMapping []*data_manage.EdbInfoCalculateMapping
+	CreatorInfo             *system.Admin //创建者的账号信息
+	UploaderInfo            *system.Admin //上传者的账号信息
 }
 
 type ChartSaveLibResp struct {
@@ -51,7 +53,7 @@ type DeleteChartReq struct {
 }
 
 // UploadChart 上传图表接口
-func UploadChart(chartInfoId int, description string) (err error, errMsg string) {
+func UploadChart(chartInfoId int, description string, uploaderInfo *system.Admin) (err error, errMsg string) {
 	defer func() {
 		if err != nil {
 			go alarm_msg.SendAlarmMsg(fmt.Sprintf("上传图表至社区失败：Err:%v,ErrMsg:%s", err, errMsg), 3)
@@ -100,6 +102,7 @@ func UploadChart(chartInfoId int, description string) (err error, errMsg string)
 		err = fmt.Errorf("获取指标详情失败,Err:" + err.Error())
 		return
 	}
+
 	req := new(ChartSaveLibReq)
 	req.ChartInfo = chartInfo
 	req.ChartEdbMapping = chartMappingList
@@ -108,6 +111,13 @@ func UploadChart(chartInfoId int, description string) (err error, errMsg string)
 	req.EdbInfoCalculateMapping = edbMappingList
 	req.Description = description
 
+	// 查询创建者信息
+	creatorInfo, _ := system.GetSysAdminById(chartInfo.SysUserId)
+	if creatorInfo != nil {
+		req.CreatorInfo = creatorInfo
+	}
+
+	req.UploaderInfo = uploaderInfo
 	// 添加计算指标
 	reqJson, err := json.Marshal(req)
 	if err != nil {