修复递归获取所有子角色可能无限循环的问题

cq-panda · cq-panda · commit 54d018906a39 · 2021-04-05T10:49:36.000+08:00
diff --git a/Vue.Net/VOL.Core/UserManager/RoleContext.cs b/Vue.Net/VOL.Core/UserManager/RoleContext.cs
@@ -5,6 +5,7 @@
 using VOL.Core.DBManager;
 using VOL.Core.Extensions.AutofacManager;
 using VOL.Core.ManageUser;
+using VOL.Core.Services;
 using VOL.Entity.DomainModels;
 
 namespace VOL.Core.UserManager
@@ -63,8 +64,9 @@ public static List<RoleNodes> GetAllChildren(int roleId)
             if (roleId <= 0) return null;
             var roles = GetAllRoleId();
             if (UserContext.IsRoleIdSuperAdmin(roleId)) return roles;
+            Dictionary<int, bool> completedRoles = new Dictionary<int, bool>();
             List<RoleNodes> rolesChildren = new List<RoleNodes>();
-            return GetChildren(roles, rolesChildren, roleId);
+            return GetChildren(roles, rolesChildren, roleId, completedRoles);
         }
         public static List<int> GetAllChildrenIds(int roleId)
         {
@@ -74,19 +76,28 @@ public static List<int> GetAllChildrenIds(int roleId)
         /// 递归获取所有子节点权限
         /// </summary>
         /// <param name="roleId"></param>
-        private static List<RoleNodes> GetChildren(List<RoleNodes> roles, List<RoleNodes> rolesChildren, int roleId)
+        private static List<RoleNodes> GetChildren(List<RoleNodes> roles, List<RoleNodes> rolesChildren, int roleId, Dictionary<int, bool> completedRoles)
         {
             roles.ForEach(x =>
             {
                 if (x.ParentId == roleId)
                 {
+                    if (completedRoles.TryGetValue(roleId, out bool isWrite))
+                    {
+                        if (!isWrite)
+                        {
+                            Logger.Error($"获取子角色异常RoleContext,角色id:{roleId}");
+                            completedRoles[roleId] = true;
+                        }
+                        return;
+                    }
                     rolesChildren.Add(x);
-                    GetChildren(roles, rolesChildren, x.Id);
+                    completedRoles.Add(x.Id, false);
+                    GetChildren(roles, rolesChildren, x.Id, completedRoles);
                 }
             });
             return rolesChildren;
         }
-
         /// <summary>
         /// 获取当前角色下的所有用户
         /// </summary>
diff --git a/Vue.Net/VOL.System/Services/System/Partial/Sys_RoleService.cs b/Vue.Net/VOL.System/Services/System/Partial/Sys_RoleService.cs
@@ -159,21 +159,38 @@ public List<int> GetAllChildrenRoleId(int roleId)
         private List<RoleNodes> GetAllChildrenNodes(int roleId)
         {
             if (UserContext.IsRoleIdSuperAdmin(roleId)) return roles;
-            rolesChildren = GetChildren(roleId);
+            Dictionary<int, bool> completedRoles = new Dictionary<int, bool>();
+            rolesChildren = GetChildren(roleId, completedRoles);
             return rolesChildren;
         }
         /// <summary>
         /// 递归获取所有子节点权限
         /// </summary>
         /// <param name="roleId"></param>
-        private List<RoleNodes> GetChildren(int roleId)
+        private List<RoleNodes> GetChildren(int roleId,Dictionary<int, bool> completedRoles)
         {
             roles.ForEach(x =>
             {
                 if (x.ParentId == roleId)
                 {
+                    if (completedRoles.TryGetValue(roleId, out bool isWrite))
+                    {
+                        if (!isWrite)
+                        {
+                            completedRoles[roleId] = true;
+                            Logger.Error($"获取子角色异常Sys_RoleService,角色id:{roleId}");
+                        }
+                        return;
+                    }
                     rolesChildren.Add(x);
-                    GetChildren(x.Id);
+
+                    completedRoles[x.Id] = false;
+
+
+                    if (x.Id != x.ParentId)
+                    {
+                        GetChildren(x.Id, completedRoles);
+                    }
                 }
             });
             return rolesChildren;
diff --git a/Vue.Net/VOL.System/Services/System/Partial/Sys_UserService.cs b/Vue.Net/VOL.System/Services/System/Partial/Sys_UserService.cs
@@ -43,7 +43,7 @@ public async Task<WebResponseContent> Login(LoginInfo loginInfo, bool verificati
                 Sys_User user = await repository.FindAsIQueryable(x => x.UserName == loginInfo.UserName)
                     .FirstOrDefaultAsync();
 
-                if (user == null || loginInfo.PassWord.Trim() != (user.UserPwd ?? "").DecryptDES(AppSetting.Secret.User))
+                if (user == null || loginInfo.Password.Trim() != (user.UserPwd ?? "").DecryptDES(AppSetting.Secret.User))
                     return responseContent.Error(ResponseType.LoginError);
 
                 string token = JwtHelper.IssueJwt(new UserInfo()
@@ -57,7 +57,7 @@ public async Task<WebResponseContent> Login(LoginInfo loginInfo, bool verificati
                 repository.Update(user, x => x.Token, true);
                 UserContext.Current.LogOut(user.User_Id);
 
-                loginInfo.PassWord = string.Empty;
+                loginInfo.Password = string.Empty;
 
                 return responseContent.OK(ResponseType.LoginSuccess);
             }
diff --git a/开发版dev/Vue.NetCore/Vue.Net/VOL.Core/UserManager/RoleContext.cs b/开发版dev/Vue.NetCore/Vue.Net/VOL.Core/UserManager/RoleContext.cs
@@ -5,6 +5,7 @@
 using VOL.Core.DBManager;
 using VOL.Core.Extensions.AutofacManager;
 using VOL.Core.ManageUser;
+using VOL.Core.Services;
 using VOL.Entity.DomainModels;
 
 namespace VOL.Core.UserManager
@@ -63,8 +64,9 @@ public static List<RoleNodes> GetAllChildren(int roleId)
             if (roleId <= 0) return null;
             var roles = GetAllRoleId();
             if (UserContext.IsRoleIdSuperAdmin(roleId)) return roles;
+            Dictionary<int, bool> completedRoles = new Dictionary<int, bool>();
             List<RoleNodes> rolesChildren = new List<RoleNodes>();
-            return GetChildren(roles, rolesChildren, roleId);
+            return GetChildren(roles, rolesChildren, roleId, completedRoles);
         }
         public static List<int> GetAllChildrenIds(int roleId)
         {
@@ -74,19 +76,28 @@ public static List<int> GetAllChildrenIds(int roleId)
         /// 递归获取所有子节点权限
         /// </summary>
         /// <param name="roleId"></param>
-        private static List<RoleNodes> GetChildren(List<RoleNodes> roles, List<RoleNodes> rolesChildren, int roleId)
+        private static List<RoleNodes> GetChildren(List<RoleNodes> roles, List<RoleNodes> rolesChildren, int roleId, Dictionary<int, bool> completedRoles)
         {
             roles.ForEach(x =>
             {
                 if (x.ParentId == roleId)
                 {
+                    if (completedRoles.TryGetValue(roleId, out bool isWrite))
+                    {
+                        if (!isWrite)
+                        {
+                            Logger.Error($"获取子角色异常RoleContext,角色id:{roleId}");
+                            completedRoles[roleId] = true;
+                        }
+                        return;
+                    }
                     rolesChildren.Add(x);
-                    GetChildren(roles, rolesChildren, x.Id);
+                    completedRoles.Add(x.Id, false);
+                    GetChildren(roles, rolesChildren, x.Id, completedRoles);
                 }
             });
             return rolesChildren;
         }
-
         /// <summary>
         /// 获取当前角色下的所有用户
         /// </summary>
diff --git a/开发版dev/Vue.NetCore/Vue.Net/VOL.System/Services/System/Partial/Sys_RoleService.cs b/开发版dev/Vue.NetCore/Vue.Net/VOL.System/Services/System/Partial/Sys_RoleService.cs
@@ -46,7 +46,7 @@ public async Task<WebResponseContent> GetCurrentUserTreePermission()
         /// <param name="roleId"></param>
         /// <returns></returns>
         public async Task<WebResponseContent> GetUserTreePermission(int roleId)
-        { 
+        {
             WebResponseContent webResponse = new WebResponseContent();
             if (!UserContext.IsRoleIdSuperAdmin(roleId) && UserContext.Current.RoleId != roleId)
             {
@@ -159,21 +159,38 @@ public List<int> GetAllChildrenRoleId(int roleId)
         private List<RoleNodes> GetAllChildrenNodes(int roleId)
         {
             if (UserContext.IsRoleIdSuperAdmin(roleId)) return roles;
-            rolesChildren = GetChildren(roleId);
+            Dictionary<int, bool> completedRoles = new Dictionary<int, bool>();
+            rolesChildren = GetChildren(roleId, completedRoles);
             return rolesChildren;
         }
         /// <summary>
         /// 递归获取所有子节点权限
         /// </summary>
         /// <param name="roleId"></param>
-        private List<RoleNodes> GetChildren(int roleId)
+        private List<RoleNodes> GetChildren(int roleId, Dictionary<int, bool> completedRoles)
         {
             roles.ForEach(x =>
             {
                 if (x.ParentId == roleId)
                 {
+                    if (completedRoles.TryGetValue(roleId, out bool isWrite))
+                    {
+                        if (!isWrite)
+                        {
+                            completedRoles[roleId] = true;
+                            Logger.Error($"获取子角色异常Sys_RoleService,角色id:{roleId}");
+                        }
+                        return;
+                    }
                     rolesChildren.Add(x);
-                    GetChildren(x.Id);
+
+                    completedRoles[x.Id] = false;
+
+
+                    if (x.Id != x.ParentId)
+                    {
+                        GetChildren(x.Id, completedRoles);
+                    }
                 }
             });
             return rolesChildren;
@@ -322,13 +339,13 @@ public override WebResponseContent Update(SaveModel saveModel)
                 {
                     return WebResponseContent.Instance.Error($"上级角色不能选择自己");
                 }
-                if (role.Role_Id==UserContext.Current.RoleId)
+                if (role.Role_Id == UserContext.Current.RoleId)
                 {
                     return WebResponseContent.Instance.Error($"不能修改自己的角色");
                 }
 
                 if (GetAllChildren(role.ParentId).Any(x => x.ParentId == role.Role_Id)
-                ||repository.Exists(x=>x.ParentId== role.Role_Id))
+                || repository.Exists(x => x.ParentId == role.Role_Id))
                 {
                     return WebResponseContent.Instance.Error($"不能选择此上级角色，选择的上级角色与当前角色形成依赖关系");
                 }
diff --git a/开发版dev/Vue.NetCore/Vue.Net/VOL.System/Services/System/Partial/Sys_UserService.cs b/开发版dev/Vue.NetCore/Vue.Net/VOL.System/Services/System/Partial/Sys_UserService.cs
@@ -43,7 +43,7 @@ public async Task<WebResponseContent> Login(LoginInfo loginInfo, bool verificati
                 Sys_User user = await repository.FindAsIQueryable(x => x.UserName == loginInfo.UserName)
                     .FirstOrDefaultAsync();
 
-                if (user == null || loginInfo.PassWord.Trim() != (user.UserPwd ?? "").DecryptDES(AppSetting.Secret.User))
+                if (user == null || loginInfo.Password.Trim() != (user.UserPwd ?? "").DecryptDES(AppSetting.Secret.User))
                     return responseContent.Error(ResponseType.LoginError);
 
                 string token = JwtHelper.IssueJwt(new UserInfo()
@@ -57,7 +57,7 @@ public async Task<WebResponseContent> Login(LoginInfo loginInfo, bool verificati
                 repository.Update(user, x => x.Token, true);
                 UserContext.Current.LogOut(user.User_Id);
 
-                loginInfo.PassWord = string.Empty;
+                loginInfo.Password = string.Empty;
 
                 return responseContent.OK(ResponseType.LoginSuccess);
             }

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ public async Task<WebResponseContent> GetCurrentUserTreePermission()`
`46`	`46`	`/// <param name="roleId"></param>`
`47`	`47`	`/// <returns></returns>`
`48`	`48`	`public async Task<WebResponseContent> GetUserTreePermission(int roleId)`
`49`		`- {`
	`49`	`+ {`
`50`	`50`	`WebResponseContent webResponse = new WebResponseContent();`
`51`	`51`	`if (!UserContext.IsRoleIdSuperAdmin(roleId) && UserContext.Current.RoleId != roleId)`
`52`	`52`	`{`
`@@ -159,21 +159,38 @@ public List<int> GetAllChildrenRoleId(int roleId)`
`159`	`159`	`private List<RoleNodes> GetAllChildrenNodes(int roleId)`
`160`	`160`	`{`
`161`	`161`	`if (UserContext.IsRoleIdSuperAdmin(roleId)) return roles;`
`162`		`- rolesChildren = GetChildren(roleId);`
	`162`	`+ Dictionary<int, bool> completedRoles = new Dictionary<int, bool>();`
	`163`	`+ rolesChildren = GetChildren(roleId, completedRoles);`
`163`	`164`	`return rolesChildren;`
`164`	`165`	`}`
`165`	`166`	`/// <summary>`
`166`	`167`	`/// 递归获取所有子节点权限`
`167`	`168`	`/// </summary>`
`168`	`169`	`/// <param name="roleId"></param>`
`169`		`- private List<RoleNodes> GetChildren(int roleId)`
	`170`	`+ private List<RoleNodes> GetChildren(int roleId, Dictionary<int, bool> completedRoles)`
`170`	`171`	`{`
`171`	`172`	`roles.ForEach(x =>`
`172`	`173`	`{`
`173`	`174`	`if (x.ParentId == roleId)`
`174`	`175`	`{`
	`176`	`+ if (completedRoles.TryGetValue(roleId, out bool isWrite))`
	`177`	`+ {`
	`178`	`+ if (!isWrite)`
	`179`	`+ {`
	`180`	`+ completedRoles[roleId] = true;`
	`181`	`+ Logger.Error($"获取子角色异常Sys_RoleService,角色id:{roleId}");`
	`182`	`+ }`
	`183`	`+ return;`
	`184`	`+ }`
`175`	`185`	`rolesChildren.Add(x);`
`176`		`- GetChildren(x.Id);`
	`186`	`+`
	`187`	`+ completedRoles[x.Id] = false;`
	`188`	`+`
	`189`	`+`
	`190`	`+ if (x.Id != x.ParentId)`
	`191`	`+ {`
	`192`	`+ GetChildren(x.Id, completedRoles);`
	`193`	`+ }`
`177`	`194`	`}`
`178`	`195`	`});`
`179`	`196`	`return rolesChildren;`
`@@ -322,13 +339,13 @@ public override WebResponseContent Update(SaveModel saveModel)`
`322`	`339`	`{`
`323`	`340`	`return WebResponseContent.Instance.Error($"上级角色不能选择自己");`
`324`	`341`	`}`
`325`		`- if (role.Role_Id==UserContext.Current.RoleId)`
	`342`	`+ if (role.Role_Id == UserContext.Current.RoleId)`
`326`	`343`	`{`
`327`	`344`	`return WebResponseContent.Instance.Error($"不能修改自己的角色");`
`328`	`345`	`}`
`329`	`346`
`330`	`347`	`if (GetAllChildren(role.ParentId).Any(x => x.ParentId == role.Role_Id)`
`331`		`- \|\|repository.Exists(x=>x.ParentId== role.Role_Id))`
	`348`	`+ \|\| repository.Exists(x => x.ParentId == role.Role_Id))`
`332`	`349`	`{`
`333`	`350`	`return WebResponseContent.Instance.Error($"不能选择此上级角色，选择的上级角色与当前角色形成依赖关系");`
`334`	`351`	`}`