|
@@ -362,15 +362,19 @@ public abstract class DefaultCallApplication : ICallApplication
|
|
|
|
|
|
if (dto.Type == 2)
|
|
|
{
|
|
|
- return query.Select((d, o, v) => new CallNativeDto
|
|
|
+ var d = query.Select((d, o, v) => new CallNativeDto
|
|
|
{
|
|
|
- OrderId = v.OrderId,
|
|
|
- OrderNo = v.Order.No,
|
|
|
- Title = v.Order.Title,
|
|
|
+ OrderId = SqlFunc.IsNull(v.OrderId, v.OrderId),
|
|
|
+ OrderNo = SqlFunc.IsNull(v.Order.No, o.No),
|
|
|
+ Title = SqlFunc.IsNull(v.Order.Title, o.Title),
|
|
|
CallState = d.CallState,
|
|
|
IsVisit = !SqlFunc.IsNullOrEmpty(v.Id),
|
|
|
IsOrder = !SqlFunc.IsNullOrEmpty(o.Id),
|
|
|
}, true);
|
|
|
+#if DEBUG
|
|
|
+ var sql = d.ToSqlString();
|
|
|
+#endif
|
|
|
+ return d;
|
|
|
}
|
|
|
if (dto.Type == 3)
|
|
|
{
|