kobe6258 4 місяців тому
батько
коміт
1b1306dc7c
2 змінених файлів з 3 додано та 3 видалено
  1. 2 2
      models/media.go
  2. 1 1
      services/product.go

+ 2 - 2
models/media.go

@@ -342,14 +342,14 @@ func UpdateMedia(m *Media) (updateId int64, err error) {
 func FilterMediaIdIdsBySourceId(mediaType MediaType, ids []int) (mediaIds []int, err error) {
 	o := orm.NewOrm()
 	condition := "id in (" + utils.GetOrmReplaceHolder(len(ids)) + ")  AND media_type = ? AND deleted=0"
-	sql := `SELECT distinct id FROM media WHERE ` + condition
+	sql := `SELECT distinct id FROM media WHERE` + condition
 	_, err = o.Raw(sql, ids, mediaType).QueryRows(&mediaIds)
 	return
 }
 
 func GetMediaIdsByCondition(condition string, pars []interface{}) (mediaIds []int, err error) {
 	o := orm.NewOrm()
-	sql := `SELECT distinct id FROM media WHERE ` + condition
+	sql := `SELECT distinct id FROM media WHERE 1=1 ` + condition
 	_, err = o.Raw(sql, pars).QueryRows(&mediaIds)
 	return
 }

+ 1 - 1
services/product.go

@@ -101,7 +101,7 @@ func getMediaIdsByCondition(setIds []int, permissionIds []int, condition string,
 		utils.FileLog.Error("过滤媒体Id失败", err.Error)
 		return
 	}
-	if condition != "" {
+	if len(mediaIds) > 0 {
 		condition += "and id in (" + utils.GetOrmReplaceHolder(len(mediaIds)) + ")"
 		pars = append(pars, mediaIds)
 		mediaIds, err = models.GetMediaIdsByCondition(condition, pars)