文档管理-自测 代码优化

controllers/document_manange/document_manage_controller.go → controllers/document_manage/document_manage_controller.go

@@ -1,6 +1,6 @@
-// Package document_manange
+// Package document_manage
 // @Author gmy 2024/9/19 14:09:00
-package document_manange
+package document_manage
 
 import (
 	"encoding/json"
@@ -17,17 +17,9 @@ type DocumentManageController struct {
 	controllers.BaseAuthController
 }
 
-// HandleResponseWithValidation
+// ValidateUser
 // 处理响应和校验
-func HandleResponseWithValidation(this *DocumentManageController, br *models.BaseResponse) bool {
-	defer func() {
-		if br.ErrMsg == "" {
-			br.IsSendEmail = false
-		}
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-
+func ValidateUser(this *DocumentManageController, br *models.BaseResponse) bool {
 	// 验证用户是否已登录
 	sysUser := this.SysUser
 	if sysUser == nil {
@@ -48,9 +40,18 @@ func HandleResponseWithValidation(this *DocumentManageController, br *models.Bas
 func (this *DocumentManageController) DocumentClassifyList() {
 	br := new(models.BaseResponse).Init()
 
-	if !HandleResponseWithValidation(this, br) {
+	defer func() {
+		if br.ErrMsg == "" {
+			br.IsSendEmail = false
+		}
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+
+	if !ValidateUser(this, br) {
 		return
 	}
+
 	sysUser := this.SysUser
 	classifyList, err := document_manage_service.DocumentClassifyList(sysUser.AdminId)
 	if err != nil {
@@ -74,7 +75,15 @@ func (this *DocumentManageController) DocumentClassifyList() {
 func (this *DocumentManageController) DocumentCollectClassify() {
 	br := new(models.BaseResponse).Init()
 
-	if !HandleResponseWithValidation(this, br) {
+	defer func() {
+		if br.ErrMsg == "" {
+			br.IsSendEmail = false
+		}
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+
+	if !ValidateUser(this, br) {
 		return
 	}
 
@@ -110,7 +119,15 @@ func (this *DocumentManageController) DocumentCollectClassify() {
 func (this *DocumentManageController) DocumentVarietyList() {
 	br := new(models.BaseResponse).Init()
 
-	if !HandleResponseWithValidation(this, br) {
+	defer func() {
+		if br.ErrMsg == "" {
+			br.IsSendEmail = false
+		}
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+
+	if !ValidateUser(this, br) {
 		return
 	}
 
@@ -136,9 +153,18 @@ func (this *DocumentManageController) DocumentVarietyList() {
 func (this *DocumentManageController) DocumentReportList() {
 	br := new(models.BaseResponse).Init()
 
-	if !HandleResponseWithValidation(this, br) {
+	defer func() {
+		if br.ErrMsg == "" {
+			br.IsSendEmail = false
+		}
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+
+	if !ValidateUser(this, br) {
 		return
 	}
+
 	// 文档类型 1-文档管理库 2-战研中心-pci
 	documentType, err := this.GetInt("DocumentType")
 	if err != nil {
@@ -153,10 +179,16 @@ func (this *DocumentManageController) DocumentReportList() {
 	}
 
 	chartPermissionIdString := this.GetString("ChartPermissionIdList")
-	chartPermissionIdList := strings.Split(chartPermissionIdString, ",")
+	var chartPermissionIdList []string
+	if strings.TrimSpace(chartPermissionIdString) != "" {
+		chartPermissionIdList = strings.Split(chartPermissionIdString, ",")
+	}
 
 	classifyIdString := this.GetString("ClassifyIdList")
-	classifyIdList := strings.Split(classifyIdString, ",")
+	var classifyIdList []string
+	if strings.TrimSpace(classifyIdString) != "" {
+		classifyIdList = strings.Split(classifyIdString, ",")
+	}
 
 	keyword := this.GetString("Keyword")
 	orderField := this.GetString("OrderField")
@@ -192,18 +224,35 @@ func (this *DocumentManageController) DocumentReportList() {
 func (this *DocumentManageController) RuiSiReportList() {
 	br := new(models.BaseResponse).Init()
 
-	if !HandleResponseWithValidation(this, br) {
+	defer func() {
+		if br.ErrMsg == "" {
+			br.IsSendEmail = false
+		}
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+
+	if !ValidateUser(this, br) {
 		return
 	}
 
 	classifyIdFirstString := this.GetString("classifyIdFirstList")
-	classifyIdFirstList := strings.Split(classifyIdFirstString, ",")
+	var classifyIdFirstList []string
+	if strings.TrimSpace(classifyIdFirstString) != "" {
+		classifyIdFirstList = strings.Split(classifyIdFirstString, ",")
+	}
 
 	classifyIdSecondString := this.GetString("classifyIdSecondList")
-	classifyIdSecondList := strings.Split(classifyIdSecondString, ",")
+	var classifyIdSecondList []string
+	if strings.TrimSpace(classifyIdSecondString) != "" {
+		classifyIdSecondList = strings.Split(classifyIdSecondString, ",")
+	}
 
 	classifyIdThirdString := this.GetString("classifyIdThirdList")
-	classifyIdThirdList := strings.Split(classifyIdThirdString, ",")
+	var classifyIdThirdList []string
+	if strings.TrimSpace(classifyIdThirdString) != "" {
+		classifyIdThirdList = strings.Split(classifyIdThirdString, ",")
+	}
 
 	keyword := this.GetString("Keyword")
 	orderField := this.GetString("OrderField")
@@ -239,11 +288,19 @@ func (this *DocumentManageController) RuiSiReportList() {
 func (this *DocumentManageController) DocumentRuiSiDetail() {
 	br := new(models.BaseResponse).Init()
 
-	if !HandleResponseWithValidation(this, br) {
+	defer func() {
+		if br.ErrMsg == "" {
+			br.IsSendEmail = false
+		}
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+
+	if !ValidateUser(this, br) {
 		return
 	}
+
 	// 获取指标数据列表
-	this.GetString("DocumentRuiSiDetail")
 
 	reportId, err := this.GetInt("ReportId")
 	if err != nil {
@@ -272,7 +329,15 @@ func (this *DocumentManageController) DocumentRuiSiDetail() {
 func (this *DocumentManageController) DocumentSave() {
 	br := new(models.BaseResponse).Init()
 
-	if !HandleResponseWithValidation(this, br) {
+	defer func() {
+		if br.ErrMsg == "" {
+			br.IsSendEmail = false
+		}
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+
+	if !ValidateUser(this, br) {
 		return
 	}
 
@@ -306,11 +371,19 @@ func (this *DocumentManageController) DocumentSave() {
 func (this *DocumentManageController) DocumentDetail() {
 	br := new(models.BaseResponse).Init()
 
-	if !HandleResponseWithValidation(this, br) {
+	defer func() {
+		if br.ErrMsg == "" {
+			br.IsSendEmail = false
+		}
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+
+	if !ValidateUser(this, br) {
 		return
 	}
+
 	// 获取指标数据列表
-	this.GetString("ChartPermissionId")
 
 	outsideReportId, err := this.GetInt("OutsideReportId")
 	if err != nil {
@@ -339,7 +412,15 @@ func (this *DocumentManageController) DocumentDetail() {
 func (this *DocumentManageController) DocumentUpdate() {
 	br := new(models.BaseResponse).Init()
 
-	if !HandleResponseWithValidation(this, br) {
+	defer func() {
+		if br.ErrMsg == "" {
+			br.IsSendEmail = false
+		}
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+
+	if !ValidateUser(this, br) {
 		return
 	}
 
@@ -369,7 +450,15 @@ func (this *DocumentManageController) DocumentUpdate() {
 func (this *DocumentManageController) DocumentDelete() {
 	br := new(models.BaseResponse).Init()
 
-	if !HandleResponseWithValidation(this, br) {
+	defer func() {
+		if br.ErrMsg == "" {
+			br.IsSendEmail = false
+		}
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+
+	if !ValidateUser(this, br) {
 		return
 	}
 

models/classify.go

@@ -92,13 +92,13 @@ type ClassifyAddReq struct {
 func GetClassifyListByCondition(condition string, pars []interface{}) (list []Classify, err error) {
 	o := orm.NewOrmUsingDB("rddp")
 	sql := `select * from classify where 1 = 1 `
-	sql += sql + condition
+	sql += condition
 	_, err = o.Raw(sql, pars).QueryRows(&list)
 	if err != nil {
 		return nil, err
 	}
 
-	return nil, err
+	return list, err
 }
 
 func GetClassifyByName(classifyName string, parentId int) (item *Classify, err error) {

models/document_manage_model/outside_report.go

@@ -48,22 +48,23 @@ func init() {
 // GetOutsideReportListByConditionCount 根据条件查询列表条数
 func GetOutsideReportListByConditionCount(condition string, pars []interface{}) (count int, err error) {
 	o := orm.NewOrmUsingDB("rddp")
-	sql := `select count(1) from outside_report t1 inner join chart_permission_search_key_word_mapping t2 on t1.classify_id = t2.classify_id  where 1 = 1 `
-	sql += sql + condition
+	sql := `select count(distinct t1.outside_report_id) from outside_report t1 inner join chart_permission_search_key_word_mapping t2 on t1.classify_id = t2.classify_id  where 1 = 1 `
+	sql += condition
 	err = o.Raw(sql, pars).QueryRow(&count)
 	if err != nil {
 		return 0, err
 	}
 
-	return 0, err
+	return count, err
 }
 
 // GetOutsideReportListByCondition 根据条件查询列表
-func GetOutsideReportListByCondition(condition string, pars []interface{}) (list []OutsideReport, err error) {
+func GetOutsideReportListByCondition(condition string, pars []interface{}, currentIndex int, pageSize int) (list []OutsideReport, err error) {
 	o := orm.NewOrmUsingDB("rddp")
-	sql := `select * from outside_report t1 left join chart_permission_search_key_word_mapping t2 on t1.classify_id = t2.classify_id  where 1 = 1 `
+	sql := `select distinct t1.* from outside_report t1 left join chart_permission_search_key_word_mapping t2 on t1.classify_id = t2.classify_id  where 1 = 1 `
 	sql += condition
-	_, err = o.Raw(sql, pars).QueryRows(&list)
+	sql += ` limit ?, ?`
+	_, err = o.Raw(sql, pars, (currentIndex-1)*pageSize, pageSize).QueryRows(&list)
 	if err != nil {
 		return nil, err
 	}
@@ -119,7 +120,10 @@ func SaveOutsideReport(outsideReport OutsideReport) (id int64, err error) {
 // GetOutsideReportById 根据ID获取报告
 func GetOutsideReportById(id int) (outsideReport *OutsideReport, err error) {
 	o := orm.NewOrmUsingDB("rddp")
-	err = o.QueryTable("outside_report").Filter("outside_report_id", id).One(&outsideReport)
+
+	outsideReport = &OutsideReport{}
+
+	err = o.QueryTable("outside_report").Filter("outside_report_id", id).One(outsideReport)
 	return
 }
 

models/report.go

@@ -1182,7 +1182,7 @@ func UpdatePdfUrlReportById(reportId int) (err error) {
 	return
 }
 
-func GetReportListByCollectCount(classifyIdFirst, classifyIdSecond, classifyIdThird []string, keyword, author string, enabled int) (count int, err error) {
+func GetReportListByCollectCount(classifyIdFirst, classifyIdSecond, classifyIdThird []string, keyword, author string, state int) (count int, err error) {
 	o := orm.NewOrmUsingDB("rddp")
 	var params []interface{}
 
@@ -1215,9 +1215,9 @@ func GetReportListByCollectCount(classifyIdFirst, classifyIdSecond, classifyIdTh
 		params = append(params, author)
 	}
 
-	if enabled > 0 {
-		sql += " AND b.enabled = ? "
-		params = append(params, enabled)
+	if state > 0 {
+		sql += " AND b.state = ? "
+		params = append(params, state)
 	}
 
 	// 第二段 SQL
@@ -1248,9 +1248,9 @@ func GetReportListByCollectCount(classifyIdFirst, classifyIdSecond, classifyIdTh
 		params = append(params, author)
 	}
 
-	if enabled > 0 {
-		sql += " AND b.enabled = ? "
-		params = append(params, enabled)
+	if state > 0 {
+		sql += " AND b.state = ? "
+		params = append(params, state)
 	}
 
 	// 第三段 SQL
@@ -1281,19 +1281,19 @@ func GetReportListByCollectCount(classifyIdFirst, classifyIdSecond, classifyIdTh
 		params = append(params, author)
 	}
 
-	if enabled > 0 {
-		sql += " AND b.enabled = ? "
-		params = append(params, enabled)
+	if state > 0 {
+		sql += " AND b.state = ? "
+		params = append(params, state)
 	}
 
 	sql += ") AS t"
 
 	// 执行 SQL 查询获取总数
 	err = o.Raw(sql, params...).QueryRow(&count)
-	return
+	return count, err
 }
 
-func GetReportListByCollectList(classifyIdFirst, classifyIdSecond, classifyIdThird []string, keyword, orderField, orderType string, startSize, pageSize int, author string, enabled int) (items []*ReportList, err error) {
+func GetReportListByCollectList(classifyIdFirst, classifyIdSecond, classifyIdThird []string, keyword, orderField, orderType string, startSize, pageSize int, author string, state int) (items []*ReportList, err error) {
 	o := orm.NewOrmUsingDB("rddp")
 	var params []interface{}
 
@@ -1326,9 +1326,9 @@ func GetReportListByCollectList(classifyIdFirst, classifyIdSecond, classifyIdThi
 		params = append(params, author)
 	}
 
-	if enabled > 0 {
-		sql += " AND b.enabled = ? "
-		params = append(params, enabled)
+	if state > 0 {
+		sql += " AND b.state = ? "
+		params = append(params, state)
 	}
 
 	// 第二段 SQL
@@ -1359,9 +1359,9 @@ func GetReportListByCollectList(classifyIdFirst, classifyIdSecond, classifyIdThi
 		params = append(params, author)
 	}
 
-	if enabled > 0 {
-		sql += " AND b.enabled = ? "
-		params = append(params, enabled)
+	if state > 0 {
+		sql += " AND b.state = ? "
+		params = append(params, state)
 	}
 
 	// 第三段 SQL
@@ -1392,9 +1392,9 @@ func GetReportListByCollectList(classifyIdFirst, classifyIdSecond, classifyIdThi
 		params = append(params, author)
 	}
 
-	if enabled > 0 {
-		sql += " AND b.enabled = ? "
-		params = append(params, enabled)
+	if state > 0 {
+		sql += " AND b.state = ? "
+		params = append(params, state)
 	}
 
 	sql += ") AS t "
@@ -1408,9 +1408,9 @@ func GetReportListByCollectList(classifyIdFirst, classifyIdSecond, classifyIdThi
 
 	// 分页
 	sql += " LIMIT ?, ?"
-	params = append(params, startSize, pageSize)
+	params = append(params, (startSize-1)*pageSize, pageSize)
 
 	// 执行 SQL 查询
 	_, err = o.Raw(sql, params...).QueryRows(&items)
-	return
+	return items, err
 }

models/user_collect_classify.go

@@ -24,21 +24,30 @@ type UserCollectClassify struct {
 func GetUserCollectClassifyList(sysUserId, classifyId int) (list []*UserCollectClassify, err error) {
 	o := orm.NewOrmUsingDB("rddp")
 	sql := `SELECT * FROM user_collect_classify WHERE 1=1`
+	var params []interface{}
+
+	// 处理 sysUserId 参数
 	if sysUserId > 0 {
 		sql += ` AND sys_user_id=?`
+		params = append(params, sysUserId)
 	}
+
+	// 处理 classifyId 参数
 	if classifyId > 0 {
 		sql += ` AND classify_id=?`
+		params = append(params, classifyId)
 	}
-	_, err = o.Raw(sql, sysUserId, classifyId).QueryRows(&list)
+
+	_, err = o.Raw(sql, params...).QueryRows(&list)
 
 	return
 }
 
 // InsertUserCollectClassify 新增用户收藏的分类
-func InsertUserCollectClassify(item *UserCollectClassify) (err error) {
+func InsertUserCollectClassify(item UserCollectClassify) (err error) {
 	o := orm.NewOrmUsingDB("rddp")
-	_, err = o.Insert(item)
+	sql := `INSERT INTO user_collect_classify(classify_id, sys_user_id, create_time) VALUES(?, ?, ?)`
+	_, err = o.Raw(sql, item.ClassifyId, item.SysUserId, item.CreateTime).Exec()
 	return
 }
 

routers/commentsRouter.go

@@ -3526,7 +3526,7 @@ func init() {
             Filters: nil,
             Params: nil})
 
-    beego.GlobalControllerRouter["eta/eta_mobile/controllers/document_manange:DocumentManageController"] = append(beego.GlobalControllerRouter["eta/eta_mobile/controllers/document_manange:DocumentManageController"],
+    beego.GlobalControllerRouter["eta/eta_mobile/controllers/document_manage:DocumentManageController"] = append(beego.GlobalControllerRouter["eta/eta_mobile/controllers/document_manage:DocumentManageController"],
         beego.ControllerComments{
             Method: "DocumentClassifyList",
             Router: `/document/classify/list`,
@@ -3535,7 +3535,7 @@ func init() {
             Filters: nil,
             Params: nil})
 
-    beego.GlobalControllerRouter["eta/eta_mobile/controllers/document_manange:DocumentManageController"] = append(beego.GlobalControllerRouter["eta/eta_mobile/controllers/document_manange:DocumentManageController"],
+    beego.GlobalControllerRouter["eta/eta_mobile/controllers/document_manage:DocumentManageController"] = append(beego.GlobalControllerRouter["eta/eta_mobile/controllers/document_manage:DocumentManageController"],
         beego.ControllerComments{
             Method: "DocumentCollectClassify",
             Router: `/document/collect/classify`,
@@ -3544,7 +3544,7 @@ func init() {
             Filters: nil,
             Params: nil})
 
-    beego.GlobalControllerRouter["eta/eta_mobile/controllers/document_manange:DocumentManageController"] = append(beego.GlobalControllerRouter["eta/eta_mobile/controllers/document_manange:DocumentManageController"],
+    beego.GlobalControllerRouter["eta/eta_mobile/controllers/document_manage:DocumentManageController"] = append(beego.GlobalControllerRouter["eta/eta_mobile/controllers/document_manage:DocumentManageController"],
         beego.ControllerComments{
             Method: "DocumentDelete",
             Router: `/document/delete`,
@@ -3553,7 +3553,7 @@ func init() {
             Filters: nil,
             Params: nil})
 
-    beego.GlobalControllerRouter["eta/eta_mobile/controllers/document_manange:DocumentManageController"] = append(beego.GlobalControllerRouter["eta/eta_mobile/controllers/document_manange:DocumentManageController"],
+    beego.GlobalControllerRouter["eta/eta_mobile/controllers/document_manage:DocumentManageController"] = append(beego.GlobalControllerRouter["eta/eta_mobile/controllers/document_manage:DocumentManageController"],
         beego.ControllerComments{
             Method: "DocumentDetail",
             Router: `/document/detail`,
@@ -3562,7 +3562,7 @@ func init() {
             Filters: nil,
             Params: nil})
 
-    beego.GlobalControllerRouter["eta/eta_mobile/controllers/document_manange:DocumentManageController"] = append(beego.GlobalControllerRouter["eta/eta_mobile/controllers/document_manange:DocumentManageController"],
+    beego.GlobalControllerRouter["eta/eta_mobile/controllers/document_manage:DocumentManageController"] = append(beego.GlobalControllerRouter["eta/eta_mobile/controllers/document_manage:DocumentManageController"],
         beego.ControllerComments{
             Method: "DocumentReportList",
             Router: `/document/report/list`,
@@ -3571,7 +3571,7 @@ func init() {
             Filters: nil,
             Params: nil})
 
-    beego.GlobalControllerRouter["eta/eta_mobile/controllers/document_manange:DocumentManageController"] = append(beego.GlobalControllerRouter["eta/eta_mobile/controllers/document_manange:DocumentManageController"],
+    beego.GlobalControllerRouter["eta/eta_mobile/controllers/document_manage:DocumentManageController"] = append(beego.GlobalControllerRouter["eta/eta_mobile/controllers/document_manage:DocumentManageController"],
         beego.ControllerComments{
             Method: "DocumentRuiSiDetail",
             Router: `/document/rui/si/detail`,
@@ -3580,7 +3580,7 @@ func init() {
             Filters: nil,
             Params: nil})
 
-    beego.GlobalControllerRouter["eta/eta_mobile/controllers/document_manange:DocumentManageController"] = append(beego.GlobalControllerRouter["eta/eta_mobile/controllers/document_manange:DocumentManageController"],
+    beego.GlobalControllerRouter["eta/eta_mobile/controllers/document_manage:DocumentManageController"] = append(beego.GlobalControllerRouter["eta/eta_mobile/controllers/document_manage:DocumentManageController"],
         beego.ControllerComments{
             Method: "RuiSiReportList",
             Router: `/document/rui/si/report/list`,
@@ -3589,7 +3589,7 @@ func init() {
             Filters: nil,
             Params: nil})
 
-    beego.GlobalControllerRouter["eta/eta_mobile/controllers/document_manange:DocumentManageController"] = append(beego.GlobalControllerRouter["eta/eta_mobile/controllers/document_manange:DocumentManageController"],
+    beego.GlobalControllerRouter["eta/eta_mobile/controllers/document_manage:DocumentManageController"] = append(beego.GlobalControllerRouter["eta/eta_mobile/controllers/document_manage:DocumentManageController"],
         beego.ControllerComments{
             Method: "DocumentSave",
             Router: `/document/save`,
@@ -3598,7 +3598,7 @@ func init() {
             Filters: nil,
             Params: nil})
 
-    beego.GlobalControllerRouter["eta/eta_mobile/controllers/document_manange:DocumentManageController"] = append(beego.GlobalControllerRouter["eta/eta_mobile/controllers/document_manange:DocumentManageController"],
+    beego.GlobalControllerRouter["eta/eta_mobile/controllers/document_manage:DocumentManageController"] = append(beego.GlobalControllerRouter["eta/eta_mobile/controllers/document_manage:DocumentManageController"],
         beego.ControllerComments{
             Method: "DocumentUpdate",
             Router: `/document/update`,
@@ -3607,7 +3607,7 @@ func init() {
             Filters: nil,
             Params: nil})
 
-    beego.GlobalControllerRouter["eta/eta_mobile/controllers/document_manange:DocumentManageController"] = append(beego.GlobalControllerRouter["eta/eta_mobile/controllers/document_manange:DocumentManageController"],
+    beego.GlobalControllerRouter["eta/eta_mobile/controllers/document_manage:DocumentManageController"] = append(beego.GlobalControllerRouter["eta/eta_mobile/controllers/document_manage:DocumentManageController"],
         beego.ControllerComments{
             Method: "DocumentVarietyList",
             Router: `/document/variety/list`,

routers/router.go

@@ -21,6 +21,7 @@ import (
 	"eta/eta_mobile/controllers/data_manage/supply_analysis"
 	"eta/eta_mobile/controllers/data_source"
 	"eta/eta_mobile/controllers/data_stat"
+	"eta/eta_mobile/controllers/document_manage"
 	"eta/eta_mobile/controllers/english_report"
 	"eta/eta_mobile/controllers/eta_trial"
 	"eta/eta_mobile/controllers/report_approve"
@@ -311,6 +312,11 @@ func init() {
 				&range_analysis.RangeChartChartInfoController{},
 			),
 		),
+		web.NSNamespace("/document_manage",
+			web.NSInclude(
+				&document_manage.DocumentManageController{},
+			),
+		),
 	)
 	web.AddNamespace(ns)
 }

services/document_manage_service/document_manage_service.go

@@ -93,7 +93,7 @@ func DocumentCollectClassify(userId, classifyId int) error {
 			return err
 		}
 	} else {
-		err = models.InsertUserCollectClassify(&models.UserCollectClassify{
+		err = models.InsertUserCollectClassify(models.UserCollectClassify{
 			ClassifyId: classifyId,
 			SysUserId:  userId,
 			CreateTime: utils.GetCurrentTime(),
@@ -205,7 +205,7 @@ func DocumentReportList(documentType int, chartPermissionIdList []string, classi
 		condition += ` order by t1.modify_time desc`
 	}
 
-	outsideReportList, err := document_manage_model.GetOutsideReportListByCondition(condition, pars)
+	outsideReportList, err := document_manage_model.GetOutsideReportListByCondition(condition, pars, startSize, pageSize)
 	if err != nil {
 		return nil, err
 	}
@@ -221,9 +221,9 @@ func RuiSiReportList(classifyIdFirst, classifyIdSecond, classifyIdThird []string
 	// 作者为 全球市场战略研究中心 PCI Research
 	author := "全球市场战略研究中心 PCI Research"
 	// 已发布的报告
-	enabled := 2
+	state := 2
 
-	count, err := models.GetReportListByCollectCount(classifyIdFirst, classifyIdSecond, classifyIdThird, keyword, author, enabled)
+	count, err := models.GetReportListByCollectCount(classifyIdFirst, classifyIdSecond, classifyIdThird, keyword, author, state)
 	if err != nil {
 		return nil, err
 	}
@@ -235,7 +235,7 @@ func RuiSiReportList(classifyIdFirst, classifyIdSecond, classifyIdThird []string
 		return &reportPage, nil
 	}
 
-	reportList, err := models.GetReportListByCollectList(classifyIdFirst, classifyIdSecond, classifyIdThird, keyword, orderField, orderType, startSize, pageSize, author, enabled)
+	reportList, err := models.GetReportListByCollectList(classifyIdFirst, classifyIdSecond, classifyIdThird, keyword, orderField, orderType, startSize, pageSize, author, state)
 	if err != nil {
 		return nil, err
 	}