check issue #38

check issue #39
check issue #36

Signed-off-by: 四少爷 <sex@jermey.cn>

OpenAuth.App/AuthorizeApp.cs

@@ -25,7 +25,7 @@ namespace OpenAuth.App
             {
                 User = service.User,
                 Orgs = service.Orgs,
-                Modules = service.Modules.MapToList<ModuleView>(),
+                Modules = service.Modules.OrderBy(u => u.SortNo).ToList().MapToList<ModuleView>(),
                 Resources = service.Resources,
                 Roles = service.Roles
             };

OpenAuth.App/CategoryManagerApp.cs

@@ -115,7 +115,19 @@ namespace OpenAuth.App
             }
             else
             {
+                //获取旧的的CascadeId
+                var CascadeId = _repository.FindSingle(o => o.Id == category.Id).CascadeId;
+                //根据CascadeId查询子分类
+                var categorys = _repository.Find(u => u.CascadeId.Contains(CascadeId) && u.Id != category.Id).OrderBy(u => u.CascadeId).ToList();
+
                 _repository.Update(category);
+
+                //更新子分类的CascadeId
+                foreach (var a in categorys)
+                {
+                    ChangeModuleCascade(a);
+                    _repository.Update(a);
+                }
             }
         }
 
@@ -147,7 +159,7 @@ namespace OpenAuth.App
             }
             else
             {
-                cascadeId = "0." + currentCascadeId +".";
+                cascadeId = ".0." + currentCascadeId +".";
             }
 
             org.CascadeId = cascadeId;

OpenAuth.App/OrgManagerApp.cs

@@ -66,7 +66,20 @@ namespace OpenAuth.App
             }
             else
             {
+                //获取旧的的CascadeId
+                var CascadeId = _repository.FindSingle(o => o.Id == org.Id).CascadeId;
+                //根据CascadeId查询子部门
+                var orgs = _repository.Find(u => u.CascadeId.Contains(CascadeId) && u.Id != org.Id).OrderBy(u => u.CascadeId).ToList();
+
+                //更新操作
                 _repository.Update(org);
+
+                //更新子部门的CascadeId
+                foreach (var a in orgs)
+                {
+                    ChangeModuleCascade(a);
+                    _repository.Update(a);
+                }
             }
 
             return org.Id;
@@ -150,7 +163,7 @@ namespace OpenAuth.App
             }
             else
             {
-                cascadeId = "0." + currentCascadeId+".";
+                cascadeId = ".0." + currentCascadeId+".";
                 org.ParentName = "根节点";
             }
 

OpenAuth.Domain/Service/ModuleManService.cs

@@ -75,17 +75,26 @@ namespace OpenAuth.Domain.Service
 
         public void AddOrUpdate(Module model)
         {
-            
+            ChangeModuleCascade(model);
             if (model.Id == Guid.Empty)
             {
-				ChangeModuleCascade(model);
                 _repository.Add(model);
             }
             else
             {
-				//从数据库获取级联ID
+                //获取旧的的CascadeId
-                model.CascadeId = _repository.FindSingle(o => o.Id == model.Id).CascadeId;
+                var CascadeId = _repository.FindSingle(o => o.Id == model.Id).CascadeId;
+                //根据CascadeId查询子部门
+                var models = _repository.Find(u => u.CascadeId.Contains(CascadeId) && u.Id != model.Id).OrderBy(u => u.CascadeId).ToList();
+
                 _repository.Update(model);
+
+                //更新子部门的CascadeId
+                foreach (var a in models)
+                {
+                    ChangeModuleCascade(a);
+                    _repository.Update(a);
+                }
             }
         }
 
@@ -171,7 +180,7 @@ namespace OpenAuth.Domain.Service
             }
             else
             {
-                cascadeId = "0." + currentCascadeId +".";
+                cascadeId = ".0." + currentCascadeId +".";
                 module.ParentName = "根节点";
             }