DuGuYang преди 1 година
родител
ревизия
6da94e4a96
променени са 2 файла, в които са добавени 2 реда и са изтрити 2 реда
  1. 1 1
      Areas/Api/Controllers/v1/Main1/ConsumerOrdersController.cs
  2. 1 1
      Areas/Api/Controllers/v1/Main2/ConsumerOrdersController.cs

+ 1 - 1
Areas/Api/Controllers/v1/Main1/ConsumerOrdersController.cs

@@ -50,7 +50,7 @@ namespace MySystem.Areas.Api.Controllers.v1.Main1
             string condition = "";
             if (!string.IsNullOrEmpty(data["MerchantName"].ToString()))
             {
-                var merAddInfo = MerchantAddInfoService.Query(" and CertMerchantName like '%" + MerchantName + "%'");
+                var merAddInfo = MerchantAddInfoService.Query(" and (QueryCount=2 or Status=2) and CertMerchantName like '%" + MerchantName + "%'");
                 condition += " and MerchantId='" + merAddInfo.Id + "'";
             }
             if (!string.IsNullOrEmpty(data["MakerCode"].ToString()))

+ 1 - 1
Areas/Api/Controllers/v1/Main2/ConsumerOrdersController.cs

@@ -50,7 +50,7 @@ namespace MySystem.Areas.Api.Controllers.v1.Main2
             string condition = "";
             if (!string.IsNullOrEmpty(data["MerchantName"].ToString()))
             {
-                var merAddInfo = MerchantAddInfoService.Query(" and CertMerchantName like '%" + MerchantName + "%'");
+                var merAddInfo = MerchantAddInfoService.Query(" and (QueryCount=2 or Status=2) and CertMerchantName like '%" + MerchantName + "%'");
                 condition += " and MerchantId='" + merAddInfo.Id + "'";
             }
             if (!string.IsNullOrEmpty(data["MakerCode"].ToString()))