|
@@ -540,7 +540,7 @@ public class BiSnapshotApplication : IBiSnapshotApplication, IScopeDependency
|
|
{
|
|
{
|
|
var query = _orderSnapshotRepository.Queryable(includeDeleted: true)
|
|
var query = _orderSnapshotRepository.Queryable(includeDeleted: true)
|
|
.LeftJoin<Order>((snapshot, order) => order.Id == snapshot.Id)
|
|
.LeftJoin<Order>((snapshot, order) => order.Id == snapshot.Id)
|
|
- .Where((snapshot, order) => order.DuplicateIds != null)
|
|
|
|
|
|
+ .Where((snapshot, order) => order.DuplicateIds != null && SqlFunc.JsonArrayLength(order.DuplicateIds) > 0)
|
|
.WhereIF(dto.No.NotNullOrEmpty(), (snapshot, order) => order.No.Contains(dto.No))
|
|
.WhereIF(dto.No.NotNullOrEmpty(), (snapshot, order) => order.No.Contains(dto.No))
|
|
.WhereIF(dto.Title.NotNullOrEmpty(), (snapshot, order) => order.Title.Contains(dto.Title))
|
|
.WhereIF(dto.Title.NotNullOrEmpty(), (snapshot, order) => order.Title.Contains(dto.Title))
|
|
.WhereIF(dto.FromName.NotNullOrEmpty(), (snapshot, order) => order.FromName.Contains(dto.FromName))
|
|
.WhereIF(dto.FromName.NotNullOrEmpty(), (snapshot, order) => order.FromName.Contains(dto.FromName))
|
|
@@ -553,6 +553,9 @@ public class BiSnapshotApplication : IBiSnapshotApplication, IScopeDependency
|
|
.WhereIF(dto.AcceptorName.NotNullOrEmpty(), (snapshot, order) => order.AcceptorName == dto.AcceptorName)
|
|
.WhereIF(dto.AcceptorName.NotNullOrEmpty(), (snapshot, order) => order.AcceptorName == dto.AcceptorName)
|
|
.WhereIF(dto.IndustryId.NotNullOrEmpty(), (snapshot, order) => snapshot.IndustryId == dto.IndustryId)
|
|
.WhereIF(dto.IndustryId.NotNullOrEmpty(), (snapshot, order) => snapshot.IndustryId == dto.IndustryId)
|
|
.Select((snapshot, order) => new DuplicateItemsOutDto(), true);
|
|
.Select((snapshot, order) => new DuplicateItemsOutDto(), true);
|
|
|
|
+#if DEBUG
|
|
|
|
+ var sql = query.ToSqlString();
|
|
|
|
+#endif
|
|
return query;
|
|
return query;
|
|
}
|
|
}
|
|
|
|
|