|
|
@@ -21,13 +21,13 @@ func NewAppRepo(engine *xorm.Engine) *AppRepo {
|
|
|
|
|
|
func (d *AppRepo) GetPage(m map[string]interface{}) (*base.PageResult, error) {
|
|
|
limit := m["limit"].(int)
|
|
|
- page := m["page"].(int)
|
|
|
+ page := m["page"].(int)
|
|
|
|
|
|
sqlSelect := ` SELECT A.* ,
|
|
|
B.app_cat_title `
|
|
|
- sqlFrom := ` FROM app AS A
|
|
|
+ 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 `
|
|
|
+ sqlWhere := ` WHERE A.deleted_flag = 0 `
|
|
|
if keywords, ok := m["keywords"]; ok {
|
|
|
sqlWhere += " AND A.app_title like '%" + fmt.Sprintf("%s", keywords) + "%'"
|
|
|
}
|
|
|
@@ -39,8 +39,8 @@ func (d *AppRepo) GetPage(m map[string]interface{}) (*base.PageResult, error) {
|
|
|
}
|
|
|
|
|
|
sqlOrderBy := " ORDER BY A.app_id "
|
|
|
- pageStart := (page - 1) * limit
|
|
|
- sqlLimit := fmt.Sprintf(" LIMIT %d OFFSET %d ", limit, pageStart)
|
|
|
+ pageStart := (page - 1) * limit
|
|
|
+ sqlLimit := fmt.Sprintf(" LIMIT %d OFFSET %d ", limit, pageStart)
|
|
|
|
|
|
datalist := make([]datamodel.App, 0)
|
|
|
err2 := d.engine.SQL(sqlSelect + sqlFrom + sqlWhere + sqlOrderBy + sqlLimit).Find(&datalist)
|
|
|
@@ -60,9 +60,9 @@ func (d *AppRepo) GetPage(m map[string]interface{}) (*base.PageResult, error) {
|
|
|
func (d *AppRepo) GetList(m map[string]interface{}) ([]viewmodel.AppInfo, error) {
|
|
|
sqlSelect := ` SELECT A.* ,
|
|
|
B.app_cat_title `
|
|
|
- sqlFrom := ` FROM app AS A
|
|
|
+ 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 `
|
|
|
+ sqlWhere := ` WHERE A.deleted_flag = 0 `
|
|
|
if keywords, ok := m["keywords"]; ok {
|
|
|
sqlWhere += " AND A.app_title like '%" + fmt.Sprintf("%s", keywords) + "%'"
|
|
|
}
|
|
|
@@ -79,9 +79,9 @@ func (d *AppRepo) GetList(m map[string]interface{}) ([]viewmodel.AppInfo, error)
|
|
|
func (d *AppRepo) GetById(appId int64) (*viewmodel.AppInfo, error) {
|
|
|
sqlSelect := ` SELECT A.* ,
|
|
|
B.app_cat_title`
|
|
|
- sqlFrom := ` FROM app AS A
|
|
|
+ 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 AND A.app_id =` + fmt.Sprintf("%d", appId)
|
|
|
+ sqlWhere := ` WHERE A.deleted_flag = 0 AND A.app_id =` + fmt.Sprintf("%d", appId)
|
|
|
|
|
|
data := &viewmodel.AppInfo{}
|
|
|
ok, err := d.engine.SQL(sqlSelect + sqlFrom + sqlWhere).Limit(1).Get(data)
|