用戶管理列表角色BUG修复

performance/Performance.Repository/PerforUserRepository.cs

@@ -45,14 +45,14 @@ public UserInfoCenter GetUser(int userId)
         /// </summary>
         /// <param name="roleType"></param>
         /// <returns></returns>
-        public List<sys_user> GetUsersByRoleType(params int[] roleType)
+        public List<sys_user> GetUsersByRoleType()
         {
             var users = from u in context.Set<sys_user>()
                         join ur in context.Set<sys_user_role>() on u.ID equals ur.UserID
                         join r in context.Set<sys_role>() on ur.RoleID equals r.ID
                         select new { u, r };
 
-            return users.Where(w => roleType.Contains(w.r.Type ?? w.r.ID)).Select(w => w.u).ToList();
+            return users.Select(w => w.u).ToList();
         }
     }
 

performance/Performance.Services/UserService.cs

@@ -158,11 +158,7 @@ public List<UserResponse> GetUserList(int userID, int roleType = 1)
             if (userConter?.User == null) throw new PerformanceException("当前用户信息无效");
             if (userConter?.URole == null) throw new PerformanceException("当前用户角色无效");
 
-            var roleTypes = (roleType == (int)Role.绩效查询)
-                ? EnumHelper.GetItems<Role>().Where(w => w.Value == (int)Role.绩效查询).Select(w => w.Value).ToArray()
-                : EnumHelper.GetItems<Role>().Where(w => w.Value != (int)Role.绩效查询).Select(w => w.Value).ToArray();
-
-            var users = _userRepository.GetUsersByRoleType(roleTypes);
+            var users = _userRepository.GetUsersByRoleType();
 
             var userRoles = _userroleRepository.GetEntities();
             var userHospitals = _userhospitalRepository.GetEntities();
@@ -240,7 +236,9 @@ public List<UserResponse> GetUserList(int userID, int roleType = 1)
                     item.RoleNameArr = roles?.Where(w => roleId.Contains(w.ID)).Select(w => w.RoleName).ToArray();
                 }
             }
-            return result;
+            return (roleType == (int)Role.绩效查询)
+                ? result.Where(w => w.RoleArr.Contains((int)Role.绩效查询)).ToList()
+                : result.Where(w => !(w.RoleArr.Length == 1 && w.RoleArr[0] == (int)Role.绩效查询)).ToList();
         }
 
         /// <summary>