浏览代码

no message

xingzai 1 年之前
父节点
当前提交
67c9579245
共有 2 个文件被更改,包括 32 次插入0 次删除
  1. 31 0
      controllers/report.go
  2. 1 0
      controllers/report_selection.go

+ 31 - 0
controllers/report.go

@@ -1583,6 +1583,19 @@ func (this *ReportController) ResearchDetail() {
 		br.ErrMsg = "报告不存在,Err:" + err.Error() + "articleId:" + strconv.Itoa(articleId)
 		br.ErrMsg = "报告不存在,Err:" + err.Error() + "articleId:" + strconv.Itoa(articleId)
 		return
 		return
 	}
 	}
+	PermissionNameMap, err := services.GetPermissionNameMap()
+	if err != nil {
+		br.Msg = "获取失败"
+		br.ErrMsg = "获取失败 GetPermissionNameMap,Err:" + err.Error()
+		return
+	}
+
+	PermissionIcoMap, err := services.GetPermissionNameIcoMap()
+	if err != nil {
+		br.Msg = "获取失败"
+		br.ErrMsg = "获取失败 GetPermissionNameMap,Err:" + err.Error()
+		return
+	}
 
 
 	//未设置全部可见的只能给弘则内部查看
 	//未设置全部可见的只能给弘则内部查看
 	if detail.VisibleRange == 1 || user.CompanyId == utils.HZ_COMPANY_ID {
 	if detail.VisibleRange == 1 || user.CompanyId == utils.HZ_COMPANY_ID {
@@ -1618,6 +1631,8 @@ func (this *ReportController) ResearchDetail() {
 			return
 			return
 		}
 		}
 		for k2, v2 := range listSecond {
 		for k2, v2 := range listSecond {
+			v2.PermissionName = PermissionNameMap[v2.ChartPermissionId]
+			v2.IcoLink = PermissionIcoMap[v2.ChartPermissionId]
 			listThird, err := models.GetResearchSummarylogSonListThird(articleId, v2.ChartPermissionId, v.Type)
 			listThird, err := models.GetResearchSummarylogSonListThird(articleId, v2.ChartPermissionId, v.Type)
 			if err != nil && err.Error() != utils.ErrNoRow() {
 			if err != nil && err.Error() != utils.ErrNoRow() {
 				br.Msg = "获取信息失败"
 				br.Msg = "获取信息失败"
@@ -1712,6 +1727,20 @@ func (this *ReportController) MinutesDetail() {
 		br.ErrMsg = "报告不存在,Err:" + err.Error() + "articleId:" + strconv.Itoa(articleId)
 		br.ErrMsg = "报告不存在,Err:" + err.Error() + "articleId:" + strconv.Itoa(articleId)
 		return
 		return
 	}
 	}
+
+	PermissionNameMap, err := services.GetPermissionNameMap()
+	if err != nil {
+		br.Msg = "获取失败"
+		br.ErrMsg = "获取失败 GetPermissionNameMap,Err:" + err.Error()
+		return
+	}
+	PermissionIcoMap, err := services.GetPermissionNameIcoMap()
+	if err != nil {
+		br.Msg = "获取失败"
+		br.ErrMsg = "获取失败 GetPermissionNameMap,Err:" + err.Error()
+		return
+	}
+
 	//未设置全部可见的只能给弘则内部查看
 	//未设置全部可见的只能给弘则内部查看
 	if detail.VisibleRange == 1 || user.CompanyId == utils.HZ_COMPANY_ID {
 	if detail.VisibleRange == 1 || user.CompanyId == utils.HZ_COMPANY_ID {
 		resp.IsShow = true
 		resp.IsShow = true
@@ -1740,6 +1769,8 @@ func (this *ReportController) MinutesDetail() {
 			return
 			return
 		}
 		}
 		for k2, v2 := range listSecond {
 		for k2, v2 := range listSecond {
+			v2.PermissionName = PermissionNameMap[v2.ChartPermissionId]
+			v2.IcoLink = PermissionIcoMap[v2.ChartPermissionId]
 			listThird, err := models.GetMinutesSummarylogListThird(articleId, v2.ChartPermissionId, v.Type)
 			listThird, err := models.GetMinutesSummarylogListThird(articleId, v2.ChartPermissionId, v.Type)
 			if err != nil && err.Error() != utils.ErrNoRow() {
 			if err != nil && err.Error() != utils.ErrNoRow() {
 				br.Msg = "获取信息失败"
 				br.Msg = "获取信息失败"

+ 1 - 0
controllers/report_selection.go

@@ -124,6 +124,7 @@ func (this *ReportSelectionController) Detail() {
 		mapChartLog[v.ChartPermissionName] = v.BodyChartSummary
 		mapChartLog[v.ChartPermissionName] = v.BodyChartSummary
 	}
 	}
 	for _, v := range listLog {
 	for _, v := range listLog {
+		v.PermissionName = PermissionNameMap[v.ChartPermissionId]
 		item := new(models.ReportSelectionChartPermission)
 		item := new(models.ReportSelectionChartPermission)
 		itemSubject := new(models.ReportSelectionChartLogPermission)
 		itemSubject := new(models.ReportSelectionChartLogPermission)
 		itemSubject.PermissionName = v.PermissionName
 		itemSubject.PermissionName = v.PermissionName