src/Hotline.Api/Controllers/OrderController.cs

@@ -1096,21 +1096,29 @@ public class OrderController : BaseController
         {
             //修改数据
             var list = await _orderVisitDetailCopyRepository.Queryable().Where(p => p.BacthId == listCopyData[0].BacthId).OrderBy(p => p.VisitTarget).ToListAsync();
-            var orderVisitDetailCopyDtos = new List<OrderVisitDetailDto>();
-            foreach (var item in list)
+            if (list != null && list.Any())
             {
-                orderVisitDetailCopyDtos.Add(_mapper.Map<OrderVisitDetailDto>(item));
+                var orderVisitDetailCopyDtos = new List<OrderVisitDetailDto>();
+                foreach (var item in list)
+                {
+                    orderVisitDetailCopyDtos.Add(_mapper.Map<OrderVisitDetailDto>(item));
+                }
+                data.OrderVisitDetailCopyDtos = orderVisitDetailCopyDtos;
+                data.CreatorName = list[0].CreatorName;
+                data.CreationTime = list[0].CreationTime;
             }
-            data.OrderVisitDetailCopyDtos = orderVisitDetailCopyDtos;
 
             //正常数据
             var listData = await _orderVisitedDetailRepository.Queryable().Where(p => p.VisitId == id).OrderBy(p => p.VisitTarget).ToListAsync();
-            var orderVisitDetailDtos = new List<OrderVisitDetailDto>();
-            foreach (var item in listData)
+            if (listData != null && listData.Any())
             {
-                orderVisitDetailDtos.Add(_mapper.Map<OrderVisitDetailDto>(item));
+                var orderVisitDetailDtos = new List<OrderVisitDetailDto>();
+                foreach (var item in listData)
+                {
+                    orderVisitDetailDtos.Add(_mapper.Map<OrderVisitDetailDto>(item));
+                }
+                data.OrderVisitDetailDtos = orderVisitDetailDtos;
             }
-            data.OrderVisitDetailDtos = orderVisitDetailDtos;
         }
 
         return data;

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

@@ -999,15 +999,6 @@ namespace Hotline.Share.Dtos.Order
 
         public bool? IsShowOperate { get; set; }
 
-        /// <summary>
-        /// 创建时间
-        /// </summary>
-        public DateTime CreationTime { get; set; }
-
-        /// <summary>
-        /// 创建人
-        /// </summary>
-        public string? CreatorName { get; set; }
     }
 
     /// <summary>
@@ -1257,5 +1248,16 @@ namespace Hotline.Share.Dtos.Order
         /// 修改记录
         /// </summary>
         public List<OrderVisitDetailDto> OrderVisitDetailCopyDtos { get; set; }
+
+
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime CreationTime { get; set; }
+
+        /// <summary>
+        /// 创建人
+        /// </summary>
+        public string? CreatorName { get; set; }
     }
 }