mirror of
https://github.com/tgdrive/teldrive.git
synced 2024-09-20 16:25:54 +08:00
fixed list
This commit is contained in:
parent
451b162cf3
commit
e6b2a796f9
|
@ -165,7 +165,8 @@ func (fs *FileService) ListFiles(c *gin.Context) (*schemas.FileResponse, *types.
|
||||||
return nil, &types.AppError{Error: errors.New(""), Code: http.StatusBadRequest}
|
return nil, &types.AppError{Error: errors.New(""), Code: http.StatusBadRequest}
|
||||||
}
|
}
|
||||||
|
|
||||||
query := fs.Db.Model(&models.File{}).Limit(pagingParams.PerPage)
|
query := fs.Db.Model(&models.File{}).Limit(pagingParams.PerPage).
|
||||||
|
Where(map[string]interface{}{"user_id": userId, "status": "active"})
|
||||||
|
|
||||||
if fileQuery.Op == "list" {
|
if fileQuery.Op == "list" {
|
||||||
|
|
||||||
|
@ -176,7 +177,6 @@ func (fs *FileService) ListFiles(c *gin.Context) (*schemas.FileResponse, *types.
|
||||||
setOrderFilter(query, &pagingParams, &sortingParams)
|
setOrderFilter(query, &pagingParams, &sortingParams)
|
||||||
|
|
||||||
query.Order("type DESC").Order(getOrder(sortingParams)).
|
query.Order("type DESC").Order(getOrder(sortingParams)).
|
||||||
Where(map[string]interface{}{"user_id": userId, "status": "active"}).
|
|
||||||
Where("parent_id in (?)", fs.Db.Model(&models.File{}).Select("id").Where("path = ?", fileQuery.Path))
|
Where("parent_id in (?)", fs.Db.Model(&models.File{}).Select("id").Where("path = ?", fileQuery.Path))
|
||||||
|
|
||||||
} else if fileQuery.Op == "find" {
|
} else if fileQuery.Op == "find" {
|
||||||
|
|
Loading…
Reference in a new issue