evan/tank
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add one more filter to image cache.

Browse Source
This commit is contained in:
zicla
2018-11-23 21:27:03 +08:00
parent 3a5c4f6302
commit 3ae6dd917b
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
rest/image_cache_controller.go
View File

@ -72,6 +72,7 @@ func (this *ImageCacheController) Page(writer http.ResponseWriter, request *http
pageStr := request.FormValue("page") pageStr := request.FormValue("page")
pageSizeStr := request.FormValue("pageSize") pageSizeStr := request.FormValue("pageSize")
userUuid := request.FormValue("userUuid") userUuid := request.FormValue("userUuid")
matterUuid := request.FormValue("matterUuid")
orderCreateTime := request.FormValue("orderCreateTime") orderCreateTime := request.FormValue("orderCreateTime")
orderSize := request.FormValue("orderSize") 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) return this.Success(pager)
} }

6
rest/image_cache_dao.go
View File

@ -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{} 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}}) 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 var conditionDB *gorm.DB
conditionDB = this.context.DB.Model(&ImageCache{}).Where(wp.Query, wp.Args...) conditionDB = this.context.DB.Model(&ImageCache{}).Where(wp.Query, wp.Args...)