From f5bb218bb36f37445d06451f51795d131f85badb Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期三, 20 十月 2021 08:39:13 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

---
 WebAPI/Controllers/BaseSet/Gy_SupplierController.cs |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/WebAPI/Controllers/BaseSet/Gy_SupplierController.cs b/WebAPI/Controllers/BaseSet/Gy_SupplierController.cs
index 696f98c..58001c2 100644
--- a/WebAPI/Controllers/BaseSet/Gy_SupplierController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_SupplierController.cs
@@ -25,17 +25,17 @@
         /// </summary>
         [Route("Gy_Supplier/list")]
         [HttpGet]
-        public object list(string sWhere)
+        public object list(string sWhere,string Organization)
         {
             try
             {
+                string sql1 = string.Format(@"select * from h_v_Gy_SupplierList where 缁勭粐鍚嶇О='" + Organization + "'");
                 if (sWhere == null || sWhere.Equals(""))
                 {
-                    ds = oCN.RunProcReturn("select * from h_v_Gy_SupplierList " + sWhere + " order by HItemID desc", "h_v_Gy_SupplierList");
+                    ds = oCN.RunProcReturn(sql1 + sWhere + " order by HItemID desc", "h_v_Gy_SupplierList");
                 }
                 else
                 {
-                    string sql1 = "select * from h_v_Gy_SupplierList where 1 = 1 ";
                     string sql = sql1 + sWhere + " order by HItemID desc";
                     ds = oCN.RunProcReturn(sql, "h_v_Gy_SupplierList");
                 }

--
Gitblit v1.9.1