多角色合并问题修改

performance/Performance.Services/RoleService.cs

@@ -67,22 +67,27 @@ public List<RoleResponse> GetUsersRole(int userid)
             
             if (ParentUser != null)   
             {
+                var userRole = _userroleRepository.GetEntities();
                 foreach (var sysUser in ParentUser)
                 {
                     var useRoles = GetARole(sysUser.ID);
                     var role = Mapper.Map<RoleResponse>(useRoles);
-                    role.Value = sysUser.ID;
+                    var uRole = userRole.Find(t => t.RoleID == role.RoleID && t.UserID == sysUser.ID);
+                    if (uRole?.UserID != null) role.Value = (int)uRole?.UserID;
                     roleResponses.Add(role);
                 }
             }
-            var roles = GetARole(userid);
-            if (roles!=null)
+
+            var isParent = user.ParentID == null || user.ParentID == 0;
+            var roles = GetARole(isParent ? userid : (int)user.ParentID);
+            if (roles != null)
+
             {
                 var role = Mapper.Map<RoleResponse>(roles);
-                role.Value = userid;
+                role.Value = isParent ? userid : (int)user.ParentID;
                 roleResponses.Add(role);
             }
-            return roleResponses;
+            return roleResponses?.OrderBy(t => t.Type).ToList();
         }
 
         /// <summary>

performance/Performance.Services/UserService.cs

@@ -150,6 +150,7 @@ public List<UserResponse> GetUserList(int userID)
                         if (user.Department == "")
                             continue;
                         var parentUser = userlist.Find(t => t.ID == user.ParentID);
+                        if (parentUser == null) continue;
                         parentUser.Department = user.Department;
                     }
                 result = Mapper.Map<List<UserResponse>>(userlist);
@@ -168,7 +169,8 @@ public List<UserResponse> GetUserList(int userID)
                         if (user.Department == "")
                             continue;
                         var parentUser = userlist.Find(t => t.ID == user.ParentID);
-                        parentUser.Department = user.Department;
+                        if (parentUser == null) continue;
+                        parentUser.Department = user?.Department;
                     }
                 result = Mapper.Map<List<UserResponse>>(userlist);
             }