甄别待申请

src/Hotline.Api/Controllers/OrderController.cs

@@ -754,12 +754,16 @@ public class OrderController : BaseController
 		var (total, items) = await _orderVisitRepository.Queryable()
 			.Includes(x => x.Order)
 			.Includes(x => x.Employee)
-			.Includes(x => x.OrderVisitDetails)
+			.Includes(x => x.OrderVisitDetails.Where(vd=> vd.VisitTarget == EVisitTarget.Org && (
+				SqlFunc.JsonField(vd.OrgProcessingResults, "Name") == "不满意" || SqlFunc.JsonField(vd.OrgProcessingResults, "Name") == "非常不满意" ||
+				SqlFunc.JsonField(vd.OrgHandledAttitude, "Name") == "不满意" || SqlFunc.JsonField(vd.OrgHandledAttitude, "Name") == "非常不满意"
+			)).ToList())
 			.WhereIF(!string.IsNullOrEmpty(dto.Keyword), d => d.Order.Title.Contains(dto.Keyword!) || d.Order.No.Contains(dto.Keyword!))
             .Where(ov=>ov.OrderVisitDetails.Any(d=> 
-            (d.OrgProcessingResults != null && (SqlFunc.JsonField(d.OrgProcessingResults,"Name")  =="不满意" || SqlFunc.JsonField(d.OrgProcessingResults, "Name") == "非常不满意")) ||
-            (d.OrgHandledAttitude != null && (SqlFunc.JsonField(d.OrgHandledAttitude, "Name") == "不满意" || SqlFunc.JsonField(d.OrgHandledAttitude, "Name") == "非常不满意"))
-			))
+            d.VisitTarget ==  EVisitTarget.Org && (
+			SqlFunc.JsonField(d.OrgProcessingResults,"Name")  =="不满意" || SqlFunc.JsonField(d.OrgProcessingResults, "Name") == "非常不满意" ||
+            SqlFunc.JsonField(d.OrgHandledAttitude, "Name") == "不满意" || SqlFunc.JsonField(d.OrgHandledAttitude, "Name") == "非常不满意"
+			)))
 			.OrderBy(x => x.CreationTime)
 			.ToPagedListAsync(dto.PageIndex, dto.PageSize, HttpContext.RequestAborted);
 		return new PagedDto<OrderVisitDto>(total, _mapper.Map<IReadOnlyList<OrderVisitDto>>(items));