Merge branch 'test' into lib/test

src/Hotline.Api/Controllers/IdentityController.cs

@@ -106,7 +106,8 @@ jxrWXHbT1FB6DqkdOnBbQqS1Azqz5HxLlSyEK3F60e3SgB5iZsDZ
         if (request is null)
             throw UserFriendlyException.SameMessage("用户名或密码错误！");
         string res;
-        if (_appOptions.Value.IsLuZhou)
+        if (bool.TryParse(_systemSettingCacheManager.GetSetting(SettingConstants.IsReplayLoginCheck)?.SettingValue[0],
+                out var isReplayCheck) && isReplayCheck)
         {
             res = await _identityAppService.LoginWithSignatureAsync(request, HttpContext.RequestAborted);
         }

src/Hotline.Api/Controllers/KnowledgeCommonController.cs

@@ -233,7 +233,7 @@ namespace Hotline.Api.Controllers
                     {
                         Id = it.Id.SelectAll(),
                         KnowledgeNum = SqlFunc.Subqueryable<Knowledge>()
-                            .Where(k => k.CreatorOrgId.StartsWith(it.Id))
+                            .Where(k => k.CreatorOrgId.StartsWith(it.Id) && k.IsDeleted == false)
                             .WhereIF(!string.IsNullOrEmpty(Attribution), k => k.Attribution == Attribution).DistinctCount(k => k.Id)
 
                     }).OrderBy(d => d.Id);

src/Hotline.Api/Controllers/OrderApi/OrderComplementController.cs

@@ -182,7 +182,7 @@ public class OrderComplementController : BaseController
             OrderId = data.OrderId,
             Opinion = data.Opinion,
             SupplyName = data.SupplyName,
-            SupplyOrg = data.SupplyOrg,
+            SupplyOrg = !string.IsNullOrEmpty(data.SupplyOrg) ? data.SupplyOrg : data.CreatorOrgName,
             SupplyTime = data.SupplyTime,
             DsBisId = data.DsBisId,
             No = data.No,
@@ -238,11 +238,25 @@ public class OrderComplementController : BaseController
     [HttpGet("get_complement_order_info/{id}")]
     public async Task<ComplementOrderDto> GetComplementOrderInfo(string id)
     {
-        var data = await _orderComplementRepository.GetAsync(p => p.Id == id, cancellationToken: HttpContext.RequestAborted);
+        var data = await _orderComplementRepository.Queryable()
+            .Includes(p => p.Order)
+            .Where(p => p.Id == id)
+            .FirstAsync();
         if (data == null)
             throw UserFriendlyException.SameMessage("补充查询失败！");
 
-        return _mapper.Map<ComplementOrderDto>(data);
+        ComplementOrderDto orderDto = new()
+        {
+            Id = id,
+            OrderId = data.OrderId,
+            Opinion = data.Opinion,
+            SupplyName = data.SupplyName,
+            SupplyOrg = !string.IsNullOrEmpty(data.SupplyOrg) ? data.SupplyOrg : data.CreatorOrgName, 
+            SupplyTime = data.SupplyTime,
+            No = data.No,
+            Title = data.Order?.Title
+        };
+        return orderDto;
     }
 
     /// <summary>
@@ -358,7 +372,8 @@ public class OrderComplementController : BaseController
             detailDto.No = data.No;
             detailDto.OrderTitle = data.Order.Title;
             detailDto.UserName = data.SupplyName;
-            detailDto.OrgName = data.CreatorOrgName;
+            detailDto.OrgName = data.SupplyOrg;
+            detailDto.SupplyTime = data.SupplyTime;
             detailDto.Opinion = data.Opinion;
             detailDto.OperationName = data.CreatorName;
             detailDto.OperationTime = data.CreationTime;

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

@@ -35,6 +35,8 @@
         /// 工单编号
         /// </summary>
         public string? No { get; set; }
+
+        public string? Title { get; set; }
     }
 
     public class ComplementOrderCopDto : ComplementOrderDto
@@ -46,12 +48,12 @@
         /// <summary>
         /// 操作时间
         /// </summary>
-        public DateTime? CreationTime {  get; set; }
+        public DateTime? CreationTime { get; set; }
 
         /// <summary>
         /// 操作人
         /// </summary>
-        public string? CreatorName {  get; set; }
+        public string? CreatorName { get; set; }
     }
 
     public class ComplementOrderCopyDetailDto

src/Hotline/Settings/SettingConstants.cs

@@ -835,5 +835,10 @@ namespace Hotline.Settings
         /// 小程序同一个用户上报工单间隔时间(单位:分)
         /// </summary>
         public const string SnapshotIntervalMinutes = "SnapshotIntervalMinutes";
+
+        /// <summary>
+        /// 防登录重放校验
+        /// </summary>
+        public const string IsReplayLoginCheck = "IsReplayLoginCheck";
     }
 }