Merge branch 'sxy' into dev

internel/dao/secFilings.go

@@ -161,15 +161,15 @@ func (secFilingsDao) ListFormType(req *secFilings.ListFormTypeReq) (res []*model
 }
 func (secFilingsDao) WebListSecFiling(req *secFilings.WebListSecFilingReq) (res []*model.SecFilings, total int64, err error) {
 	query := db.DocDB.Model(&model.SecFilings{}).Where("status = ?", 1)
-	if err := query.Count(&total).Error; err != nil {
-		return nil, total, err
-	}
 	if req.Year != "" {
 		start := fmt.Sprintf("%s-01-01", req.Year)
 		end := fmt.Sprintf("%s-12-31", req.Year)
 		query = query.Where("filing_date BETWEEN ? AND ?", start, end)
 
 	}
+	if err := query.Count(&total).Error; err != nil {
+		return nil, total, err
+	}
 	if req.Page != 0 && req.PageSize != 0 {
 		query = query.Limit(int(req.PageSize)).Offset(int(req.Page-1) * int(req.PageSize))
 	}