特提修改期满时间

src/Hotline.Api/Controllers/HomeController.cs

@@ -62,16 +62,26 @@ public class HomeController : BaseController
     /// </summary>
     /// <returns></returns>
     [HttpGet("myinfo")]
-    public async Task<User?> GetMyInfo()
+    public async Task<Object> GetMyInfo()
     {
         if (!string.IsNullOrEmpty(_sessionContext.UserId))
         {
-            return await _userRepository.Queryable()
+	        var monitor = false;
+	        var setting = _systemSettingCacheManager.GetSetting(SettingConstants.SeatsMonitor);
+	        var settingStr = setting?.SettingValue;
+	        var roles = _sessionContext.Roles;
+	        foreach (var item in settingStr)
+	        {
+		        if (roles != null && roles.Contains(item)) monitor = true;
+	        }
+
+			var user = 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);
+            return new { User = user, Monitor = monitor };
         }
         throw UserFriendlyException.SameMessage("无效登录信息");
     }

src/Hotline.Api/Controllers/OrderController.cs

@@ -3283,7 +3283,7 @@ public class OrderController : BaseController
 			var orderDto = _mapper.Map<OrderDto>(order);
 			await _capPublisher.PublishAsync(Hotline.Share.Mq.EventNames.HotlineOrderExpiredTimeUpdate, orderDto, cancellationToken: HttpContext.RequestAborted);
 			//}
-			await _workflowApplication.RecallAsync(recall, order.ExpiredTime, HttpContext.RequestAborted);
+			await _workflowApplication.RecallAsync(recall, expiredTime.ExpiredTime, HttpContext.RequestAborted);
             var publish = await _orderPublishRepository.GetAsync(x => x.OrderId == dto.OrderId);
             if (publish != null)
             {
@@ -3468,7 +3468,7 @@ public class OrderController : BaseController
 
 			//todo 特提重办，按审批通过时间依据中心派至部门的规则计算期满时间，更新order
 
-			await _workflowApplication.RecallAsync(recall, order.ExpiredTime, HttpContext.RequestAborted);
+			await _workflowApplication.RecallAsync(recall, expiredTime.ExpiredTime, HttpContext.RequestAborted);
             var publish = await _orderPublishRepository.GetAsync(x => x.OrderId == special.OrderId);
             if (publish != null)
             {