瀏覽代碼

去掉发布报告的限制

xiexiaoyuan 3 年之前
父節點
當前提交
81f17adfb8
共有 2 個文件被更改,包括 15 次插入1 次删除
  1. 10 1
      models/tables/rddp/report/query.go
  2. 5 0
      services/report/report.go

+ 10 - 1
models/tables/rddp/report/query.go

@@ -117,9 +117,18 @@ func GetLatestByReportIds(ids []int) (item *Report, err error) {
 	return
 }
 
+// GetPublishByReportId 根据id获取报告
+func GetPublishByReportId(id int) (item *Report, err error) {
+	err = global.MYSQL["rddp"].Where("id = ? and state = 2", id).First(&item).Error
+	if err == utils.ErrNoRow {
+		err = nil
+	}
+	return
+}
+
 // GetByReportId 根据id获取报告
 func GetByReportId(id int) (item *Report, err error) {
-	err = global.MYSQL["rddp"].Where("id = ? and state = 2", id).First(&item).Error
+	err = global.MYSQL["rddp"].Where("id = ? ", id).First(&item).Error
 	if err == utils.ErrNoRow {
 		err = nil
 	}

+ 5 - 0
services/report/report.go

@@ -358,6 +358,11 @@ func GetReportDetail(userinfo user.UserInfo, reportId int) (reportDetail respons
 		return
 	}
 
+	if reportInfo.Stage != 2 {
+		err = errors.New("报告未发布")
+		return
+	}
+
 	//判断权限
 	var authOk bool
 	var permissionCheckInfo response.PermissionCheckInfo