|
@@ -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 = "获取信息失败"
|