修改和完善

IoTSharp/Controllers/AccountController.cs

@@ -475,11 +475,12 @@ namespace IoTSharp.Controllers
         {
             var mx = m.CustomerId.ToString();
             var users = await _userManager.GetUsersForClaimAsync(_signInManager.Context.User.FindFirst(m => m.Type == IoTSharpClaimTypes.Customer && m.Value == mx));
-            var data = await m.Query(users.AsQueryable(), c => string.IsNullOrEmpty(c.UserName), c => c.UserName, c => new UserItemDto()
+            var uid = users.Select(u => u.Id).ToList();
+            var data = await m.Query(_context.Users, c => uid.Contains(c.Id), c => c.UserName, c => new UserItemDto()
             {
                 Id = c.Id,
+                UserName = c.UserName,
                 Email = c.Email,
-                Roles = new List<string>(_userManager.GetRolesAsync(c).Result),
                 PhoneNumber = c.PhoneNumber,
                 AccessFailedCount = c.AccessFailedCount,
                 LockoutEnabled= c.LockoutEnabled,

IoTSharp/Dtos/AccountDto.cs

@@ -123,6 +123,10 @@ namespace IoTSharp.Dtos
         /// 锁定时长
         /// </summary>
         public DateTimeOffset? LockoutEnd { get; set; }
+        /// <summary>
+        /// 用户名
+        /// </summary>
+        public string UserName { get;  set; }
     }
 
     public class UserPassword

IoTSharp/Extensions/QueryExtensions.cs

@@ -144,6 +144,7 @@ namespace IoTSharp.Extensions
             };
             List<R> rs = new List<R>();
             rs = await query.Select(conver).ToListAsync(cancellationToken);
+            data.rows = rs;
             return data;
         }
 

IoTSharp/IoTSharp.xml

@@ -881,6 +881,11 @@
             锁定时长
             </summary>
         </member>
+        <member name="P:IoTSharp.Dtos.UserItemDto.UserName">
+            <summary>
+            用户名
+            </summary>
+        </member>
         <member name="P:IoTSharp.Dtos.UserPassword.Pass">
             <summary>
             旧密码