|
@@ -1018,14 +1018,6 @@ func (this *ChartInfoController) ChartInfoDetail() {
|
|
|
|
|
|
// 图表数据权限
|
|
|
{
|
|
|
- // 图表分类
|
|
|
- chartClassify, err := data_manage.GetChartClassifyById(chartInfo.ChartClassifyId)
|
|
|
- if err != nil {
|
|
|
- br.Msg = "获取失败"
|
|
|
- br.ErrMsg = "获取图表分类信息失败,Err:" + err.Error()
|
|
|
- return
|
|
|
- }
|
|
|
-
|
|
|
// 已授权分类id
|
|
|
permissionChartIdList, permissionClassifyIdList, err := data_manage_permission.GetUserChartAndClassifyPermissionList(this.SysUser.AdminId, chartInfo.ChartInfoId, chartInfo.ChartClassifyId)
|
|
|
if err != nil {
|
|
@@ -1033,7 +1025,19 @@ func (this *ChartInfoController) ChartInfoDetail() {
|
|
|
br.ErrMsg = "获取已授权分类id数据失败,Err:" + err.Error()
|
|
|
return
|
|
|
}
|
|
|
- chartInfo.HaveOperaAuth = data_manage_permission.CheckChartPermissionByPermissionIdList(chartInfo.IsJoinPermission, chartClassify.IsJoinPermission, chartInfo.ChartInfoId, chartInfo.ChartClassifyId, permissionChartIdList, permissionClassifyIdList)
|
|
|
+ if chartInfo.ChartClassifyId > 0 {
|
|
|
+ // 图表分类
|
|
|
+ chartClassify, err := data_manage.GetChartClassifyById(chartInfo.ChartClassifyId)
|
|
|
+ if err != nil {
|
|
|
+ br.Msg = "获取失败"
|
|
|
+ br.ErrMsg = "获取图表分类信息失败,Err:" + err.Error()
|
|
|
+ return
|
|
|
+ }
|
|
|
+ chartInfo.HaveOperaAuth = data_manage_permission.CheckChartPermissionByPermissionIdList(chartInfo.IsJoinPermission, chartClassify.IsJoinPermission, chartInfo.ChartInfoId, chartInfo.ChartClassifyId, permissionChartIdList, permissionClassifyIdList)
|
|
|
+ } else {
|
|
|
+ chartInfo.HaveOperaAuth = data_manage_permission.CheckChartPermissionByPermissionIdList(chartInfo.IsJoinPermission, 0, chartInfo.ChartInfoId, chartInfo.ChartClassifyId, permissionChartIdList, permissionClassifyIdList)
|
|
|
+ }
|
|
|
+
|
|
|
}
|
|
|
}
|
|
|
|