user

src/Hotline.Api/Controllers/FileController.cs

@@ -41,7 +41,7 @@ namespace Hotline.Api.Controllers
 		/// <summary>
 		/// 新增附件
 		/// </summary>
-		/// <param name="dto"></param>
+		/// <param name="dtos"></param>
 		/// <returns></returns>
 		[Permission(EPermission.AddFile)]
 		[HttpPost]

src/Hotline.Api/Controllers/HomeController.cs

@@ -66,7 +66,11 @@ public class HomeController : BaseController
     {
         if (!string.IsNullOrEmpty(_sessionContext.UserId))
         {
-            return await _userRepository.Queryable().Includes(x => x.Organization).FirstAsync(x => x.Id == _sessionContext.UserId);
+            return await _userRepository.Queryable()
+                .Includes(x => x.Organization)
+                .Includes(x=>x.Account)
+                .Includes(x=>x.Roles)
+                .FirstAsync(x => x.Id == _sessionContext.UserId);
             //return await _userRepository.GetAsync(_sessionContext.UserId);
         }
         throw UserFriendlyException.SameMessage("无效登录信息");

src/Hotline.Api/Controllers/PbxController.cs

@@ -327,7 +327,6 @@ namespace Hotline.Api.Controllers
         /// <summary>
         /// 开始分机休息
         /// </summary>
-        /// <param name="id"></param>
         /// <returns></returns>
         [Permission(EPermission.Rest)]
         [HttpGet("begin-rest")]

src/Hotline.Api/Controllers/SettingController.cs

@@ -213,7 +213,7 @@ namespace Hotline.Api.Controllers
 		/// <summary>
 		/// 新增标签(支持批量)
 		/// </summary>
-		/// <param name="dto"></param>
+		/// <param name="dtos"></param>
 		/// <returns></returns>
 		[HttpPost("businessTag")]
 		public async Task Add([FromBody] List<BusinessTagDto> dtos)
@@ -272,7 +272,6 @@ namespace Hotline.Api.Controllers
 		/// <summary>
 		/// 获取标签基本数据
 		/// </summary>
-		/// <param name="id"></param>
 		/// <returns></returns>
 		[HttpGet("businessTag/baseData")]
 		public async Task<object> TagBaseData()

src/Hotline.Api/Controllers/SysController.cs

@@ -45,6 +45,11 @@ namespace Hotline.Api.Controllers
         /// <param name="systemMenuRepository"></param>
         /// <param name="sysDicDataRepository"></param>
         /// <param name="sysDicTypeRepository"></param>
+        /// <param name="commonOpinionDomainService"></param>
+        /// <param name="commonOpinionRepository"></param>
+        /// <param name="sessionContext"></param>
+        /// <param name="systemAreaDomainService"></param>
+        /// <param name="systemAreaRepository"></param>
         public SysController(
             IMapper mapper,
             IRepository<SystemSetting> systemSettingsRepository,

src/Hotline.Api/Controllers/TestController.cs

@@ -53,7 +53,6 @@ public class TestController : BaseController
     private readonly ISugarUnitOfWork<WexDbContext> _uowWex;
     private readonly IRepository<OrderUrge> _orderUrgeRepository;
     private readonly IRepositoryTextSearch<OrderTs> _repositoryts;
-    private readonly IGroupManager _goupManager;
 
     private readonly ITimeLimitDomainService _timeLimitDomainService;
 

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

@@ -304,10 +304,10 @@ namespace Hotline.Share.Dtos.Order
         /// </summary>
         public string OrderTypeText => OrderType.GetDescription();
 
-        /// <summary>
-        /// 受理类型
-        /// </summary>
-        //public string AcceptTypeText => AcceptType.GetDescription();
+        ///// <summary>
+        ///// 受理类型
+        ///// </summary>
+        ////public string AcceptTypeText => AcceptType.GetDescription();
 
         /// <summary>
         /// 紧急程度

src/Hotline.Share/Dtos/Push/FWMessage/SendSmsModelDto.cs

@@ -4,90 +4,105 @@ namespace Hotline.Share.Dtos.Push.FWMessage
 {
     public class SendSmsModelDto
     {
-        [DataMember]
         /// <summary>
         /// 待发ID
         /// </summary>
-        public int nWaitID;
         [DataMember]
+        public int nWaitID;
         /// <summary>
         /// 帐号
         /// </summary>
-        public string strAccountUser;
         [DataMember]
+        public string strAccountUser;
+
         /// <summary>
         /// 密码
         /// </summary>
-        public string strAccountPwd;
         [DataMember]
+        public string strAccountPwd;
+
         /// <summary>
         /// 短信类型
         /// </summary>
-        public string strType;
         [DataMember]
+        public string strType;
+
         /// <summary>
         /// 流程ID
         /// </summary>
-        public int nFlowID;
         [DataMember]
+        public int nFlowID;
+
         /// <summary>
         /// 接收姓名
         /// </summary>
-        public string strPhoneName;
         [DataMember]
+        public string strPhoneName;
+
         /// <summary>
         /// 接收号码
         /// </summary>
-        public string strPhoneNumber;
         [DataMember]
+        public string strPhoneNumber;
+
         /// <summary>
         /// 接收号码
         /// </summary>
-        public string strPhoneNumberAll;
         [DataMember]
+        public string strPhoneNumberAll;
+
         /// <summary>
         /// 批量发送号码格式为，姓名,号码
         /// </summary>
-        public List<object[]> listSendTelNumber;
         [DataMember]
+        public List<object[]> listSendTelNumber;
+
         /// <summary>
         /// 批量发送号码
         /// </summary>
-        public System.Data.DataTable dtTelNumber;
         [DataMember]
+        public System.Data.DataTable dtTelNumber;
+
         /// <summary>
         /// 短信内容
         /// </summary>
-        public string strPhoneConnent;
         [DataMember]
+        public string strPhoneConnent;
+
         /// <summary>
         /// 备注
         /// </summary>
-        public string strRemark;
         [DataMember]
+        public string strRemark;
+
         /// <summary>
         /// 添加时间
         /// </summary>
-        public DateTime dAddTime;
         [DataMember]
+        public DateTime dAddTime;
+
         /// <summary>
         /// 用户ID
         /// </summary>
-        public int nUserID;
         [DataMember]
+        public int nUserID;
+
         /// <summary>
         /// 用户姓名
         /// </summary>
-        public string strUserName;
         [DataMember]
+        public string strUserName;
+
         /// <summary>
         /// 发送部门ID
         /// </summary>
-        public int nBMID;
         [DataMember]
+        public int nBMID;
+
         /// <summary>
         /// 发送部门名称
         /// </summary>
+        [DataMember]
         public string strBMName;
     }
 }

src/Hotline/Orders/OrderRedo.cs

@@ -38,10 +38,6 @@ namespace Hotline.Orders
         [SugarColumn(ColumnDataType = "json", IsJson = true, IsNullable = true)]
         public List<string> FileIds { get; set; }
 
-        public string CreatorName { get; set; }
-
-        public string CreatorOrgName { get; set; }
-
         /// <summary>
         /// 重办部门code
         /// </summary>