Merge branch 'hotfix/bug7305_report_create' into debug

controllers/report_v2.go

@@ -934,7 +934,7 @@ func (this *ReportController) SaveReportContent() {
 // @Param   ClassifyIdThird   query   int  true       "三级分类id"
 // @Param   State   query   string  true       "报告状态，多状态用英文,隔开"
 // @Success 200 {object} models.ReportListResp
-// @router /list/authorized [get]
+// @router /list/authorized [get]		
 func (this *ReportController) AuthorizedListReport() {
 	br := new(models.BaseResponse).Init()
 	defer func() {
@@ -959,18 +959,18 @@ func (this *ReportController) AuthorizedListReport() {
 	startSize = utils.StartIndex(currentIndex, pageSize)
 	var list []*models.ReportList
 
-	// 没有输入信息，那就不展示
-	// if keyword == `` && classifyIdFirst <= 0 {
-	// 	page := paging.GetPaging(currentIndex, pageSize, 0)
-	// 	resp := new(models.ReportListResp)
-	// 	resp.Paging = page
-	// 	resp.List = list
-	// 	br.Ret = 200
-	// 	br.Success = true
-	// 	br.Msg = "获取成功"
-	// 	br.Data = resp
-	// 	return
-	// }
+	//没有输入信息，那就不展示
+	if keyword == `` && classifyIdFirst <= 0 {
+		page := paging.GetPaging(currentIndex, pageSize, 0)
+		resp := new(models.ReportListResp)
+		resp.Paging = page
+		resp.List = list
+		br.Ret = 200
+		br.Success = true
+		br.Msg = "获取成功"
+		br.Data = resp
+		return
+	}
 
 	// 当前用户有权限的报告id列表
 	grantReportIdList := make([]int, 0)