src/Hotline.Api/Controllers/UserController.cs

@@ -324,7 +324,7 @@ public class UserController : BaseController
     /// </summary>
     /// <param name="name"></param>
     /// <returns></returns>
-    [HttpGet("withOrg")]
+    [HttpGet("withorg")]
     public async Task<IReadOnlyList<UserDto>> Query([FromQuery] string name)
     {
         var users = await _userRepository.Queryable()

src/Hotline.Application/Mappers/MapperConfigs.cs

@@ -25,7 +25,10 @@ namespace Hotline.Application.Mappers
                 .Map(d => d.UserName, x => x.Account.UserName)
                 .Map(d => d.OrgName, x => x.Organization.OrgName)
                 .Map(d => d.Roles, x => string.Join(',', x.Account.Roles.Select(d => d.DisplayName)))
-                .Map(d => d.State, x => x.IsDeleted ? "已删除" : "正常");
+                .Map(d => d.State, x => x.IsDeleted ? "已删除" : "正常")
+                .IgnoreIf((s, d) => s.Account == null, d => d.UserName)
+                .IgnoreIf((s, d) => s.Account == null, d => d.Roles)
+                ;
 
             config.NewConfig<Role, RoleDto>()
                 .Map(d => d.AccountIds, x => x.Accounts.Select(d => d.Id))

src/Hotline.Share/Dtos/Order/QueryOrderDto.cs

@@ -3,10 +3,38 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
+using Hotline.Share.Enums.Order;
+using Hotline.Share.Requests;
 
 namespace Hotline.Share.Dtos.Order
 {
-    public class QueryOrderDto
+    public record QueryOrderDto : PagedKeywordRequest
     {
+
+        /// <summary>
+        /// 诉求内容
+        /// </summary>
+        public string? Content { get; set; }
+
+        /// <summary>
+        /// 受理类型
+        /// </summary>
+        public EAcceptType? AcceptType { get; set; }
+
+        /// <summary>
+        /// 来源渠道
+        /// </summary>
+        public EChannel? Channel { get; set; }
+
+        /// <summary>
+        /// 转接号码（转接来源）
+        /// </summary>
+        public string? TransferPhone { get; set; }
+
+        /// <summary>
+        /// 热点分类
+        /// </summary>
+        public string HotspotId { get; set; }
+        
     }
 }

src/Hotline/Orders/Order.cs

@@ -158,7 +158,6 @@ namespace Hotline.Orders
 
         #endregion
         
-
         /// <summary>
         /// 当前节点名称
         /// </summary>