筛选某一方通过的商户显示

Areas/Api/Controllers/v1/Main1/MerchantAddInfoController.cs

@@ -208,7 +208,7 @@ namespace MySystem.Areas.Api.Controllers.v1.Main1
             int pageSize = int.Parse(function.CheckInt(data["page_size"].ToString()));
             int pageNum = int.Parse(function.CheckInt(data["page_num"].ToString()));
             string condition = "";
-            var merIds = MerchantInfoUtil.QuerySenedMerchantId();
+            var merIds = MerchantInfoUtil.QueryAnyIsOkMerchantId();
             condition = " and Id in (" + merIds + ")";
             if (!string.IsNullOrEmpty(MerchantName))
             {

Areas/Api/Controllers/v1/Main2/MerchantAddInfoController.cs

@@ -228,7 +228,7 @@ namespace MySystem.Areas.Api.Controllers.v1.Main2
             int pageSize = int.Parse(function.CheckInt(data["page_size"].ToString()));
             int pageNum = int.Parse(function.CheckInt(data["page_num"].ToString()));
             string condition = "";
-            var merIds = MerchantInfoUtil.QuerySenedMerchantId();
+            var merIds = MerchantInfoUtil.QueryAnyIsOkMerchantId();
             condition = " and Id in (" + merIds + ")";
             if (!string.IsNullOrEmpty(MerchantName))
             {

Util/Main1/MerchantInfoUtil.cs

@@ -89,6 +89,31 @@ namespace MySystem.Service.Main1
         }
         #endregion
 
+
+        #region 获取某一方已通过的商户Id
+        /// <summary>
+        /// 获取某一方已通过的商户Id
+        /// </summary>
+        /// <returns></returns>
+        public static string QueryAnyIsOkMerchantId()
+        {
+            var info = "";
+            List<RelationData> relationData = new List<RelationData>();
+            var merInfo = MerchantInfoService.List(relationData, " and (Status=2 or QueryCount=2)", 1, 9999999);
+            if (merInfo.Count > 0)
+            {
+                var merIds = "";
+                foreach (Dictionary<string, object> dic in merInfo)
+                {
+                    var MerchantId = int.Parse(dic["Id"].ToString());
+                    merIds += MerchantId + ",";
+                }
+                info = merIds.TrimEnd(',');
+            }
+            return info;
+        }
+        #endregion
+
         #region 获取是否激活商户Id
         /// <summary>
         /// 获取是否激活商户Id

Util/Main2/MerchantInfoUtil.cs

@@ -73,7 +73,32 @@ namespace MySystem.Service.Main2
         {
             var info = "";
             List<RelationData> relationData = new List<RelationData>();
-            var merInfo = MerchantInfoService.List(relationData," and Sort=1",1,9999999);
+            var merInfo = MerchantInfoService.List(relationData, " and Sort=1", 1, 9999999);
+            if (merInfo.Count > 0)
+            {
+                var merIds = "";
+                foreach (Dictionary<string, object> dic in merInfo)
+                {
+                    var MerchantId = int.Parse(dic["Id"].ToString());
+                    merIds += MerchantId + ",";
+                }
+                info = merIds.TrimEnd(',');
+            }
+            return info;
+        }
+        #endregion
+
+
+        #region 获取某一方已通过的商户Id
+        /// <summary>
+        /// 获取某一方已通过的商户Id
+        /// </summary>
+        /// <returns></returns>
+        public static string QueryAnyIsOkMerchantId()
+        {
+            var info = "";
+            List<RelationData> relationData = new List<RelationData>();
+            var merInfo = MerchantInfoService.List(relationData, " and (Status=2 or QueryCount=2)", 1, 9999999);
             if (merInfo.Count > 0)
             {
                 var merIds = "";