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

Finish some code refine work.

Browse Source
This commit is contained in:
zicla
2019-04-24 22:43:58 +08:00
parent 960c82ec36
commit f2bed9ac33
6 changed files with 203 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
rest/matter_controller.go
View File

@ -170,7 +170,6 @@ func (this *MatterController) Page(writer http.ResponseWriter, request *http.Req
return this.Success(pager)
}
//创建一个文件夹。
func (this *MatterController) CreateDirectory(writer http.ResponseWriter, request *http.Request) *result.WebResult {
@ -178,7 +177,6 @@ func (this *MatterController) CreateDirectory(writer http.ResponseWriter, reques
name := request.FormValue("name")
userUuid := request.FormValue("userUuid")
//管理员可以指定给某个用户创建文件夹。
user := this.checkUser(writer, request)
if user.Role != USER_ROLE_ADMINISTRATOR {
@ -198,8 +196,6 @@ func (this *MatterController) CreateDirectory(writer http.ResponseWriter, reques
return this.Success(matter)
}
//上传文件
func (this *MatterController) Upload(writer http.ResponseWriter, request *http.Request) *result.WebResult {
@ -236,7 +232,9 @@ func (this *MatterController) Upload(writer http.ResponseWriter, request *http.R
fileName = fileName[pos+1:]
}
matter := this.matterService.Upload(file, user, puuid, fileName, privacy, false)
dirMatter := this.matterDao.CheckDirByUuid(puuid, user)
matter := this.matterService.Upload(file, user, dirMatter, fileName, privacy)
return this.Success(matter)
}