fix eddycjy#19

gaecom · Nov 30, 2018 · 39b5fc9 · 39b5fc9
1 parent 8e115e0
commit 39b5fc9
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/models/tag.go b/models/tag.go
@@ -41,12 +41,17 @@ func AddTag(name string, state int, createdBy string) error {
 }
 
 func GetTags(pageNum int, pageSize int, maps interface{}) ([]Tag, error) {
-	var tags []Tag
+	var (
+		tags []Tag
+	 	err error
+	)
+
 	if pageSize > 0 && pageNum > 0 {
-		db = db.Offset(pageNum).Limit(pageSize)
+		err = db.Where(maps).Find(&tags).Offset(pageNum).Limit(pageSize).Error
+	} else {
+		err = db.Where(maps).Find(&tags).Error
 	}
 
-	err := db.Where(maps).Find(&tags).Error
 	if err != nil && err != gorm.ErrRecordNotFound {
 		return nil, err
 	}