ht

domian/report/permission_service.go

@@ -48,7 +48,7 @@ func GetReportPermissionsById(id int, source string) (permissionIds []Permission
 		//展示一级品种
 		return getETAReportFirstPermissions(id)
 	case SourceHT:
-		getHTReportFirstPermissions(id)
+		return getHTReportFirstPermissions(id)
 	}
 	return
 }
@@ -58,7 +58,7 @@ func GetReportSecondPermissionsById(id int, source string) (permissionIds []Perm
 	case SourceETA:
 		return getETAReportSecondPermissions(id)
 	case SourceHT:
-		getHTReportSecondPermissions(id)
+		return getHTReportSecondPermissions(id)
 	}
 	return
 }

domian/report/report_service.go

@@ -268,7 +268,7 @@ func getETAReportFirstPermissions(id int) (permissionDTOs []PermissionDTO) {
 }
 
 func getHTReportFirstPermissions(id int) (permissionDTOs []PermissionDTO) {
-	report, err := reportDao.GetReportById(id)
+	report, err := reportDao.GetReportByOrgId(id, SourceHT)
 	if err != nil {
 		logger.Error("获取报告失败:%v", err)
 	}
@@ -303,7 +303,7 @@ func getETAReportSecondPermissions(id int) (permissionDTOs []PermissionDTO) {
 }
 
 func getHTReportSecondPermissions(id int) (permissionDTOs []PermissionDTO) {
-	report, err := reportDao.GetReportById(id)
+	report, err := reportDao.GetReportByOrgId(id, SourceHT)
 	if err != nil {
 		logger.Error("获取报告失败:%v", err)
 	}

models/report/report.go

@@ -25,8 +25,8 @@ const (
 	StatusUnPublish ReportStatus = "UNPUBLISH"
 
 	MaxBatchNum   = 1000
-	CommonColumns = "id,org_id,author,abstract,title,source,cover_src,published_time,status"
-	taskColumns   = "id,author,published_time,status"
+	CommonColumns = "id,org_id,author,abstract,title,source,cover_src,published_time,status,plate_name"
+	taskColumns   = "id,author,published_time,status,plate_name"
 )
 
 type Report struct {
@@ -128,7 +128,7 @@ func GetAuthorByOrgId(orgId int, source string) (names []string, err error) {
 	return
 }
 
-func GetReportByOrgId(orgId int, source string) (reports []Report, err error) {
+func GetReportByOrgId(orgId int, source string) (reports Report, err error) {
 	db := models.Main()
 	err = db.Select(CommonColumns).Where("org_id = ? and source =? ", orgId, source).Find(&reports).Error
 	return

routers/router.go

@@ -4,7 +4,6 @@ import (
 	"eta/eta_mini_ht_api/controllers/media"
 	"eta/eta_mini_ht_api/controllers/report"
 	"eta/eta_mini_ht_api/controllers/user"
-	"eta/eta_mini_ht_api/middleware"
 	"github.com/beego/beego/v2/server/web"
 	"github.com/beego/beego/v2/server/web/filter/cors"
 	"time"
@@ -21,7 +20,7 @@ func init() {
 	}))
 	//增加授权拦截
 
-	web.InsertFilter("*", web.BeforeRouter, middleware.AuthMiddleware())
+	//web.InsertFilter("*", web.BeforeRouter, middleware.AuthMiddleware())
 
 	ns := web.NewNamespace("/htapi",
 		web.NSNamespace("/user",