Merge branch 'test' of http://110.188.24.182:10023/Fengwo/hotline into test

src/Hotline.Api/Controllers/CommonPController.cs

@@ -498,7 +498,8 @@ namespace Hotline.Api.Controllers
 				.Includes(x => x.OrderVisit, y => y.Employee)
 				.Includes(x => x.OrderScreens)
 				.Where(x => x.OrderScreens.Any(s => s.Status == EScreenStatus.SendBack && s.ScreenType ==  EOrderScreenType.Org && s.SendBackApply == true) || x.OrderScreens.Any() == false)
-				.Where(x => x.OrderVisit.VisitState == EVisitState.Visited && x.OrderVisit.IsCanHandle)
+                .Where(x => x.OrderVisit.Order.ReceiveProvinceNo.StartsWith("ZGZFW") == false || string.IsNullOrEmpty(x.OrderVisit.Order.ReceiveProvinceNo))
+                .Where(x => x.OrderVisit.VisitState == EVisitState.Visited && x.OrderVisit.IsCanHandle)
 				.Where(x => x.VisitTarget == EVisitTarget.Org && x.VisitOrgCode == _sessionContext.OrgId && (
 					SqlFunc.JsonField(x.OrgProcessingResults, "Key") == "1" ||
 					SqlFunc.JsonField(x.OrgProcessingResults, "Key") == "2" ||

src/Hotline.Application/Orders/OrderApplication.cs

@@ -3017,7 +3017,7 @@ public class OrderApplication : IOrderApplication, IScopeDependency
                          x.OrderScreens.Any() == false
              //|| x.OrderScreens.Any(s => (s.Status != EScreenStatus.SendBack && s.SendBackApply != true)) == false
              )
-             .Where(x=> x.OrderVisit.Order.ReceiveProvinceNo.StartsWith("ZGZFW")==false)
+             .Where(x=> x.OrderVisit.Order.ReceiveProvinceNo.StartsWith("ZGZFW")==false || string.IsNullOrEmpty(x.OrderVisit.Order.ReceiveProvinceNo))
              .WhereIF(dto.ScreenType == EOrderScreenType.Seat, x => x.OrderVisit.Order.IsProvince == false)
              .WhereIF(dto.ScreenSendBack is 1,
                  x => x.OrderScreens.Any(s => s.Status == EScreenStatus.SendBack && s.ScreenType == dto.ScreenType && s.SendBackApply == true))