diff --git a/sqle/api/controller/v1/audit_plan.go b/sqle/api/controller/v1/audit_plan.go index efe1dedec8..5bf922f440 100644 --- a/sqle/api/controller/v1/audit_plan.go +++ b/sqle/api/controller/v1/audit_plan.go @@ -666,7 +666,7 @@ func GetAuditPlans(c echo.Context) error { "offset": offset, } if !up.CanViewProject() { - instanceNames, err := dms.GetInstanceNamesInProjectByIds(c.Request().Context(), projectUid, up.GetInstancesByOP(v1.OpPermissionTypeViewOtherAuditPlan)) + instanceNames, err := dms.GetInstanceNamesInProjectByIds(c.Request().Context(), projectUid, up.GetInstancesByOP(v1.OpPermissionTypeSaveAuditPlan)) if err != nil { return err } @@ -797,7 +797,7 @@ func GetAuditPlanReports(c echo.Context) error { } apName := c.Param("audit_plan_name") - _, exist, err := GetAuditPlanIfCurrentUserCanView(c, projectUid, apName, v1.OpPermissionTypeViewOtherAuditPlan) + _, exist, err := GetAuditPlanIfCurrentUserCanView(c, projectUid, apName, v1.OpPermissionTypeSaveAuditPlan) if err != nil { return controller.JSONBaseErrorReq(c, err) } @@ -857,7 +857,7 @@ func GetAuditPlanReport(c echo.Context) error { } apName := c.Param("audit_plan_name") - ap, exist, err := GetAuditPlanIfCurrentUserCanView(c, projectUid, apName, v1.OpPermissionTypeViewOtherAuditPlan) + ap, exist, err := GetAuditPlanIfCurrentUserCanView(c, projectUid, apName, v1.OpPermissionTypeSaveAuditPlan) if err != nil { return controller.JSONBaseErrorReq(c, err) } @@ -1225,7 +1225,7 @@ func GetAuditPlanNotifyConfig(c echo.Context) error { } apName := c.Param("audit_plan_name") - ap, exist, err := GetAuditPlanIfCurrentUserCanView(c, projectUid, apName, v1.OpPermissionTypeViewOtherAuditPlan) + ap, exist, err := GetAuditPlanIfCurrentUserCanView(c, projectUid, apName, v1.OpPermissionTypeSaveAuditPlan) if err != nil { return controller.JSONBaseErrorReq(c, err) } @@ -1401,7 +1401,7 @@ func GetAuditPlanSQLs(c echo.Context) error { } apName := c.Param("audit_plan_name") - ap, exist, err := GetAuditPlanIfCurrentUserCanView(c, projectUid, apName, v1.OpPermissionTypeViewOtherAuditPlan) + ap, exist, err := GetAuditPlanIfCurrentUserCanView(c, projectUid, apName, v1.OpPermissionTypeSaveAuditPlan) if err != nil { return controller.JSONBaseErrorReq(c, err) } @@ -1482,7 +1482,7 @@ func GetAuditPlanReportSQLsV1(c echo.Context) error { } apName := c.Param("audit_plan_name") - ap, exist, err := GetAuditPlanIfCurrentUserCanView(c, projectUid, apName, v1.OpPermissionTypeViewOtherAuditPlan) + ap, exist, err := GetAuditPlanIfCurrentUserCanView(c, projectUid, apName, v1.OpPermissionTypeSaveAuditPlan) if err != nil { return controller.JSONBaseErrorReq(c, err) } diff --git a/sqle/api/controller/v1/project_permission.go b/sqle/api/controller/v1/project_permission.go index d92368e199..93f7b98f96 100644 --- a/sqle/api/controller/v1/project_permission.go +++ b/sqle/api/controller/v1/project_permission.go @@ -329,7 +329,7 @@ func GetInstanceAuditPlanIfCurrentUserCanView(c echo.Context, projectId, instanc return ap, true, nil } } - opTypes := []dmsV1.OpPermissionType{dmsV1.OpPermissionTypeViewOtherAuditPlan, dmsV1.OpPermissionTypeSaveAuditPlan} + opTypes := []dmsV1.OpPermissionType{dmsV1.OpPermissionTypeSaveAuditPlan} for _, opType := range opTypes { dbServiceReq := &dmsV2.ListDBServiceReq{ ProjectUid: projectId, @@ -344,7 +344,7 @@ func GetInstanceAuditPlanIfCurrentUserCanView(c echo.Context, projectId, instanc } } } - return ap, false, errors.NewUserNotPermissionError(dmsV1.GetOperationTypeDesc(dmsV1.OpPermissionTypeViewOtherAuditPlan)) + return ap, false, errors.NewUserNotPermissionError(dmsV1.GetOperationTypeDesc(dmsV1.OpPermissionTypeSaveAuditPlan)) } func GetInstanceAuditPlanIfCurrentUserCanOp(c echo.Context, projectId, instanceAuditPlanID string, opType dmsV1.OpPermissionType) (*model.InstanceAuditPlan, bool, error) { @@ -399,7 +399,7 @@ func GetAuditPlantReportAndInstanceIfCurrentUserCanView(c echo.Context, projectI auditPlanReport *model.AuditPlanReportV2, auditPlanReportSQLV2 *model.AuditPlanReportSQLV2, instance *model.Instance, err error) { - ap, exist, err := GetAuditPlanIfCurrentUserCanView(c, projectId, auditPlanName, dmsV1.OpPermissionTypeViewOtherAuditPlan) + ap, exist, err := GetAuditPlanIfCurrentUserCanView(c, projectId, auditPlanName, dmsV1.OpPermissionTypeSaveAuditPlan) if err != nil { return nil, nil, nil, err } diff --git a/sqle/api/controller/v2/audit_plan.go b/sqle/api/controller/v2/audit_plan.go index 7e76eefd37..fc9d733c7f 100644 --- a/sqle/api/controller/v2/audit_plan.go +++ b/sqle/api/controller/v2/audit_plan.go @@ -101,7 +101,7 @@ func GetAuditPlans(c echo.Context) error { "offset": offset, } if !up.IsAdmin() { - instanceNames, err := dms.GetInstanceNamesInProjectByIds(c.Request().Context(), projectUid, up.GetInstancesByOP(dmsV1.OpPermissionTypeViewOtherAuditPlan)) + instanceNames, err := dms.GetInstanceNamesInProjectByIds(c.Request().Context(), projectUid, up.GetInstancesByOP(dmsV1.OpPermissionTypeSaveAuditPlan)) if err != nil { return err } @@ -195,7 +195,7 @@ func GetAuditPlanReportSQLs(c echo.Context) error { } apName := c.Param("audit_plan_name") - ap, exist, err := v1.GetAuditPlanIfCurrentUserCanView(c, projectUid, apName, dmsV1.OpPermissionTypeViewOtherAuditPlan) + ap, exist, err := v1.GetAuditPlanIfCurrentUserCanView(c, projectUid, apName, dmsV1.OpPermissionTypeSaveAuditPlan) if err != nil { return controller.JSONBaseErrorReq(c, err) } diff --git a/sqle/api/controller/v2/instance_audit_plan.go b/sqle/api/controller/v2/instance_audit_plan.go index 4feafb3c7e..f9227ad1b6 100644 --- a/sqle/api/controller/v2/instance_audit_plan.go +++ b/sqle/api/controller/v2/instance_audit_plan.go @@ -249,7 +249,7 @@ func GetInstanceAuditPlans(c echo.Context) error { } if !up.CanViewProject() { // 如果有配置SQL管控权限,那么可以查看自己创建的或者该权限对应数据源的 - accessibleInstanceId := up.GetInstancesByOP(dmsCommonV1.OpPermissionTypeViewOtherAuditPlan, dmsCommonV1.OpPermissionTypeSaveAuditPlan) + accessibleInstanceId := up.GetInstancesByOP(dmsCommonV1.OpPermissionTypeSaveAuditPlan) if len(accessibleInstanceId) > 0 { data["accessible_instances_id"] = fmt.Sprintf("\"%s\"", strings.Join(accessibleInstanceId, "\",\"")) }