Merge branch 'bestflow' of https://git.oschina.net/yubaolee/OpenAuth.Net into bestflow

This commit is contained in:
四少爷
2017-04-18 09:54:34 +08:00
34 changed files with 2743 additions and 2517 deletions

View File

@@ -152,7 +152,7 @@ namespace OpenAuth.Domain.Service
var sameLevels = _repository.Find(o => o.ParentId == module.ParentId && o.Id != module.Id);
foreach (var obj in sameLevels)
{
int objCascadeId = int.Parse(obj.CascadeId.Split('.').Last());
int objCascadeId = int.Parse(obj.CascadeId.TrimEnd('.').Split('.').Last());
if (currentCascadeId <= objCascadeId) currentCascadeId = objCascadeId + 1;
}
@@ -161,7 +161,7 @@ namespace OpenAuth.Domain.Service
var parentOrg = _repository.FindSingle(o => o.Id == module.ParentId);
if (parentOrg != null)
{
cascadeId = parentOrg.CascadeId + "." + currentCascadeId;
cascadeId = parentOrg.CascadeId + currentCascadeId +".";
module.ParentName = parentOrg.Name;
}
else
@@ -171,7 +171,7 @@ namespace OpenAuth.Domain.Service
}
else
{
cascadeId = "0." + currentCascadeId;
cascadeId = "0." + currentCascadeId +".";
module.ParentName = "根节点";
}