Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

王 垚

2021-10-20 f5bb218bb36f37445d06451f51795d131f85badb

 WebAPI/Controllers/BaseSet/Gy_CustomerController.cs

@@ -25,17 +25,17 @@
        /// </summary>
        [Route("Gy_Customer/list")]
        [HttpGet]
        public object list(string sWhere)
        public object list(string sWhere,string Organization)
        {
            try
            {
                string sql1 = string.Format(@"select * from h_v_Gy_CustomerList where 组织名称='" + Organization + "'");
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select * from h_v_Gy_CustomerList " + sWhere + " order by HItemID desc", "h_v_Gy_CustomerList");
                    ds = oCN.RunProcReturn(sql1 + sWhere + " order by HItemID desc", "h_v_Gy_CustomerList");
                }
                else
                {
                    string sql1 = "select * from h_v_Gy_CustomerList where 1 = 1 ";
                    string sql = sql1 + sWhere + " order by HItemID desc";
                    ds = oCN.RunProcReturn(sql, "h_v_Gy_CustomerList");
                }