houyaf 3 tahun lalu
induk
melakukan
9b7cdde87a
1 mengubah file dengan 5 tambahan dan 6 penghapusan
  1. 5 6
      repositories/system/app_repo.go

+ 5 - 6
repositories/system/app_repo.go

@@ -19,7 +19,6 @@ func NewAppRepo(engine *xorm.Engine) *AppRepo {
 }
 
 func (d *AppRepo) GetPage(m map[string]interface{}) (*viewmodels.PageResult, error) {
-	keywords  := m["keywords"].(string)
 	limit     := m["limit"].(int)
 	page      := m["page"].(int)
 
@@ -28,8 +27,8 @@ func (d *AppRepo) GetPage(m map[string]interface{}) (*viewmodels.PageResult, err
 	sqlFrom   := ` FROM       app     AS A
                    LEFT  JOIN app_cat AS B ON (A.app_cat_id = B.app_cat_id)`
 	sqlWhere  := ` WHERE A.deleted_flag = 0 `
-	if keywords != "" {
-		sqlWhere += ` AND A.app_title like ` + "'%" + keywords + "%'"
+	if keywords, ok:= m["keywords"]; ok {
+		sqlWhere += " AND A.app_title like '%" + fmt.Sprintf("%s", keywords) + "%'"
 	}
 
 	sqlCount    := ` SELECT COUNT(*) `
@@ -49,10 +48,10 @@ func (d *AppRepo) GetPage(m map[string]interface{}) (*viewmodels.PageResult, err
 	}
 
 	pageResult := &viewmodels.PageResult{}
-	pageResult.Data = datalist
-	pageResult.Total = total
+	pageResult.Data     = datalist
+	pageResult.Total    = total
 	pageResult.PageSize = limit
-	pageResult.Page = page
+	pageResult.Page     = page
 	return pageResult, nil
 }