fix role,user查看; 设备状态

Src/Dlhis.Sys/Identity/Services/Implements/UserService.cs

@@ -1,5 +1,4 @@
-using System.Configuration;
-using Dlhis.Entity.Sys.Entities;
+using Dlhis.Entity.Sys.Entities;
 using Dlhis.Sys.Identity.Request;
 using Dlhis.Sys.Identity.Response;
 using Kurisu.AspNetCore.Utils.Extensions;
@@ -23,13 +22,18 @@ public class UserService : IUserService
     public async Task<Pagination<UserResponse>> GetPageAsync(UserPageRequest request)
     {
         return await _dbContext.Queryable<UserEntity>()
+            .LeftJoin<UserRoleEntity>((x, ur) => x.Id == ur.UserId)
+            .LeftJoin<RoleEntity>((x, ur, r) => ur.RoleId == r.Id)
             .WhereIF(request.Search.IsPresent(), x => x.UserName.Contains(request.Search)
             || x.NormalizedUserName.Contains(request.Search)
             || x.Email.Contains(request.Search)
             || x.NormalizedEmail.Contains(request.Search)
             || x.PhoneNumber.Contains(request.Search)
             )
-            .Select<UserResponse>()
+            .Select((x, ur, r) => new UserResponse
+            {
+                Id = x.Id
+            }, true)
             .ToPageListAsync(request);
     }