Merge branch 'bugfix_7157' into debug

controllers/data_manage/chart_info.go

@@ -2543,11 +2543,11 @@ func GetChartInfoDetailFromUniqueCode(chartInfo *data_manage.ChartInfoView, isCa
 	}
 
 	// 已授权分类id
-	permissionChartIdList, permissionClassifyIdList, err := data_manage_permission.GetUserChartAndClassifyPermissionList(adminId, chartInfo.ChartInfoId, chartInfo.ChartClassifyId)
-	if err != nil {
-		errMsg = "获取已授权分类id数据失败，Err:" + err.Error()
-		return
-	}
+	//permissionChartIdList, permissionClassifyIdList, err := data_manage_permission.GetUserChartAndClassifyPermissionList(adminId, chartInfo.ChartInfoId, chartInfo.ChartClassifyId)
+	//if err != nil {
+	//	errMsg = "获取已授权分类id数据失败，Err:" + err.Error()
+	//	return
+	//}
 
 	// 指标数据map
 	edbClassifyPermissionMap := make(map[int]data_manage_permission.EdbClassifyPermission)
@@ -2578,8 +2578,18 @@ func GetChartInfoDetailFromUniqueCode(chartInfo *data_manage.ChartInfoView, isCa
 
 			// 图表权限校验
 			{
-				resp.ChartInfo.HaveOperaAuth = data_manage_permission.CheckChartPermissionByPermissionIdList(chartInfo.IsJoinPermission, chartClassify.IsJoinPermission, chartInfo.ChartInfoId, chartInfo.ChartClassifyId, permissionChartIdList, permissionClassifyIdList)
-
+				shareObj := new(data_manage.ChartInfoShare)
+				shareUserIdList, err := shareObj.GetAllUserIdListByChartInfoId(chartInfo.ChartInfoId)
+				if err != nil && err.Error() != utils.ErrNoRow() {
+					msg = "获取失败"
+					errMsg = "获取我的图表信息失败，GetAllUserIdListByChartInfoId，Err:" + err.Error()
+					return
+				}
+				//utils.InArrayByInt(permissionChartInfoIdList, chartInfoId) {
+				//resp.ChartInfo.HaveOperaAuth = data_manage_permission.CheckChartPermissionByPermissionIdList(chartInfo.IsJoinPermission, chartClassify.IsJoinPermission, chartInfo.ChartInfoId, chartInfo.ChartClassifyId, permissionChartIdList, permissionClassifyIdList)
+				if sysUser.AdminId == chartInfo.SysUserId || chartInfo.PublicStatus == 3 || utils.InArrayByInt(shareUserIdList, chartInfo.SysUserId) {
+					resp.ChartInfo.HaveOperaAuth = true
+				}
 				//图表操作权限
 				chartInfo.IsEdit = data.CheckOpChartPermission(sysUser, chartInfo.SysUserId, resp.ChartInfo.HaveOperaAuth)
 				chartInfo.Button = data_manage.ChartViewButton{