diff --git a/apis/sysfileinfo/sysfileinfo.go b/apis/sysfileinfo/sysfileinfo.go index 6b35bc9..2ee4bb7 100644 --- a/apis/sysfileinfo/sysfileinfo.go +++ b/apis/sysfileinfo/sysfileinfo.go @@ -16,11 +16,17 @@ func GetSysFileInfoList(c *gin.Context) { var pageIndex = 1 if size := c.Request.FormValue("pageSize"); size != "" { - pageSize = tools.StrToInt(err, size) + pageSize, err = tools.StringToInt(size) } + tools.HasError(err, "", -1) if index := c.Request.FormValue("pageIndex"); index != "" { - pageIndex = tools.StrToInt(err, index) + pageIndex, err = tools.StringToInt(index) } + tools.HasError(err, "", -1) + if pid := c.Request.FormValue("pId"); pid != "" { + data.PId, err = tools.StringToInt(pid) + } + tools.HasError(err, "", -1) data.DataScope = tools.GetUserIdStr(c) result, count, err := data.GetPage(pageSize, pageIndex) diff --git a/models/sysfileinfo.go b/models/sysfileinfo.go index 5a2d55e..ff9a047 100644 --- a/models/sysfileinfo.go +++ b/models/sysfileinfo.go @@ -10,7 +10,7 @@ type SysFileInfo struct { Type string `json:"type" gorm:"type:varchar(255);"` // 文件类型 Name string `json:"name" gorm:"type:varchar(255);"` // 文件名称 Size string `json:"size" gorm:"type:int(11);"` // 文件大小 - PId string `json:"pId" gorm:"type:int(11);"` // 目录id + PId int `json:"pId" gorm:"type:int(11);"` // 目录id Source string `json:"source" gorm:"type:varchar(255);"` // 文件源 Url string `json:"url" gorm:"type:varchar(255);"` // 文件路径 FullUrl string `json:"fullUrl" gorm:"type:varchar(255);"` // 文件全路径