分页+borrowStatus

models/book/book.go

@@ -165,6 +165,9 @@ FROM
 	if barcode != "" {
 		sql += ` and b.book_barcode = '` + barcode + `'`
 	}
+	if borrowStatus != models.BORROW_TYPE_RESERVE {
+		sql += ` and a.borrow_status in(0,1,2,3)`
+	}
 	sql += ` order by a.create_date desc limit ` + strconv.Itoa((page-1)*pageSize) + `, ` + strconv.Itoa(pageSize)
 	beego.Error(sql)
 	err := m.db.Sql(sql).Find(&record)

service/book/book.go

@@ -33,7 +33,7 @@ func (s *BookServ) GetBookRecommendList(caseid string, page, pageSize int) (map[
 	if pageSize == 0 {
 		pageSize = service.PAGENUM
 	}
-	if page == 0 {
+	if page <= 0 {
 		page = 1
 	}
 	list, err := s.dao.GetBookRecommendList(caseid, page, pageSize)
@@ -53,7 +53,7 @@ func (s *BookServ) GetBookList(bookType, name, barcode, showzero, caseid string,
 	if pageSize == 0 {
 		pageSize = service.PAGENUM
 	}
-	if page == 0 {
+	if page <= 0 {
 		page = 1
 	}
 	list, err := s.dao.GetBookList(bookType, name, barcode, showzero, caseid, page, pageSize)
@@ -133,7 +133,7 @@ func (s *BookServ) GetMineRecord(status string, page, pageSize int) (map[string]
 	if pageSize == 0 {
 		pageSize = service.PAGENUM
 	}
-	if page == 0 {
+	if page <= 0 {
 		page = 1
 	}
 	customer := s.ctx.Get("customer").(model.TaCustomer)
@@ -159,7 +159,7 @@ func (s *BookServ) GetInStockChangeByBookId(bookId string, page, pageSize int) (
 	if pageSize == 0 {
 		pageSize = service.PAGENUM
 	}
-	if page == 0 {
+	if page <= 0 {
 		page = 1
 	}
 	list, err := s.dao.GetInStockChangeByBookId(bookId, page, pageSize)
@@ -339,7 +339,7 @@ func (s *BookServ) GetCustomerReturnList(customerInfo, caseId string, page, page
 	if pageSize == 0 {
 		pageSize = service.PAGENUM
 	}
-	if page == 0 {
+	if page <= 0 {
 		page = 1
 	}
 	list, err := s.dao.GetCustomerReturnList(customerInfo, caseId, page, pageSize)
@@ -420,7 +420,7 @@ func (s *BookServ) GetRecordList(borrowStatus, caseid, customerName, customerPho
 	if pageSize == 0 {
 		pageSize = service.PAGENUM
 	}
-	if page == 0 {
+	if page <= 0 {
 		page = 1
 	}
 	list, err := s.dao.GetRecordList(borrowStatus, caseid, customerName, customerPhone, bookName, barcode, page, pageSize)