IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into feature/files

Browse Source 
# Conflicts:
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
This commit is contained in:
pavelbannov 2020-08-14 11:42:13 +03:00
commit 6d92275269
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
View File

@ -535,7 +535,7 @@ namespace ASC.Files.Core.Data
if (file.CreateOn == default) file.CreateOn = TenantUtil.DateTimeNow();
toUpdate = FilesDbContext.Files
.Where(r => r.Id == file.ID && r.Version == file.Version)
.Where(r => r.Id == file.ID && r.Version == file.Version && r.TenantId == TenantID)
.FirstOrDefault();
toUpdate.Version = file.Version;
@ -880,7 +880,7 @@ namespace ASC.Files.Core.Data
{
var toUpdate = Query(FilesDbContext.Files)
.Where(r => r.Id == fileId)
.Where(r => r.Version >= fileVersion);
.Where(r => r.Version > fileVersion);
foreach (var f in toUpdate)
{
@ -903,8 +903,8 @@ namespace ASC.Files.Core.Data
var toUpdate = Query(FilesDbContext.Files)
.Where(r => r.Id == fileId)
.Where(r => r.Version >= fileVersion)
.Where(r => r.VersionGroup >= versionGroup);
.Where(r => r.Version > fileVersion)
.Where(r => r.VersionGroup > versionGroup);
foreach (var f in toUpdate)
{