Add one more filter to image cache.
This commit is contained in:
@ -72,6 +72,7 @@ func (this *ImageCacheController) Page(writer http.ResponseWriter, request *http
|
||||
pageStr := request.FormValue("page")
|
||||
pageSizeStr := request.FormValue("pageSize")
|
||||
userUuid := request.FormValue("userUuid")
|
||||
matterUuid := request.FormValue("matterUuid")
|
||||
orderCreateTime := request.FormValue("orderCreateTime")
|
||||
orderSize := request.FormValue("orderSize")
|
||||
|
||||
@ -104,7 +105,7 @@ func (this *ImageCacheController) Page(writer http.ResponseWriter, request *http
|
||||
},
|
||||
}
|
||||
|
||||
pager := this.imageCacheDao.Page(page, pageSize, userUuid, sortArray)
|
||||
pager := this.imageCacheDao.Page(page, pageSize, userUuid, matterUuid, sortArray)
|
||||
|
||||
return this.Success(pager)
|
||||
}
|
||||
|
@ -80,7 +80,7 @@ func (this *ImageCacheDao) ListByUserUuidAndPuuidAndDirAndName(userUuid string)
|
||||
}
|
||||
|
||||
//获取某个文件夹下所有的文件和子文件
|
||||
func (this *ImageCacheDao) Page(page int, pageSize int, userUuid string, sortArray []OrderPair) *Pager {
|
||||
func (this *ImageCacheDao) Page(page int, pageSize int, userUuid string, matterUuid string, sortArray []OrderPair) *Pager {
|
||||
|
||||
var wp = &WherePair{}
|
||||
|
||||
@ -88,6 +88,10 @@ func (this *ImageCacheDao) Page(page int, pageSize int, userUuid string, sortArr
|
||||
wp = wp.And(&WherePair{Query: "user_uuid = ?", Args: []interface{}{userUuid}})
|
||||
}
|
||||
|
||||
if matterUuid != "" {
|
||||
wp = wp.And(&WherePair{Query: "matter_uuid = ?", Args: []interface{}{matterUuid}})
|
||||
}
|
||||
|
||||
var conditionDB *gorm.DB
|
||||
conditionDB = this.context.DB.Model(&ImageCache{}).Where(wp.Query, wp.Args...)
|
||||
|
||||
|
Reference in New Issue
Block a user