|
@@ -56,15 +56,13 @@ func (d *AppRepo) GetPage(m map[string]interface{}) (*viewmodels.PageResult, err
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
func (d *AppRepo) GetList(m map[string]interface{}) ([]viewmodels.AppInfo, error) {
|
|
func (d *AppRepo) GetList(m map[string]interface{}) ([]viewmodels.AppInfo, error) {
|
|
|
- keywords := m["keywords"].(string)
|
|
|
|
|
-
|
|
|
|
|
sqlSelect := ` SELECT A.* ,
|
|
sqlSelect := ` SELECT A.* ,
|
|
|
- B.app_cat_title`
|
|
|
|
|
|
|
+ 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)`
|
|
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 != "" {
|
|
|
|
|
- sqlWhere += ` AND A.app_title like ` + "'%" + keywords + "%'"
|
|
|
|
|
|
|
+ if keywords, ok := m["keywords"]; ok {
|
|
|
|
|
+ sqlWhere += " AND A.app_title like '%" + fmt.Sprintf("%s", keywords) + "%'"
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
sqlOrderBy := " ORDER BY app_id DESC "
|
|
sqlOrderBy := " ORDER BY app_id DESC "
|
|
@@ -82,7 +80,6 @@ func (d *AppRepo) GetById(appId int64) (*viewmodels.AppInfo, error) {
|
|
|
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)`
|
|
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 := &viewmodels.AppInfo{}
|
|
data := &viewmodels.AppInfo{}
|
|
|
ok, err := d.engine.SQL(sqlSelect + sqlFrom + sqlWhere).Limit(1).Get(data)
|
|
ok, err := d.engine.SQL(sqlSelect + sqlFrom + sqlWhere).Limit(1).Get(data)
|
|
@@ -108,7 +105,7 @@ func (d *AppRepo) Update(data *datamodels.App) error {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
func (d *AppRepo) Delete(m map[string]interface{}) error {
|
|
func (d *AppRepo) Delete(m map[string]interface{}) error {
|
|
|
- appId := m["appId"].(int64)
|
|
|
|
|
|
|
+ appId := m["appId"].(int64)
|
|
|
deletedBy := m["deletedBy"].(int64)
|
|
deletedBy := m["deletedBy"].(int64)
|
|
|
|
|
|
|
|
data := &datamodels.App{}
|
|
data := &datamodels.App{}
|