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

YL

2021-11-09 926d7b9567c444975e972518ba2fcb4d82a93345

 WebAPI/Controllers/BaseSet/Gy_CustomerController.cs

@@ -25,7 +25,7 @@
        /// </summary>
        [Route("Gy_Customer/list")]
        [HttpGet]
        public object list(string sWhere,string Organization)
        public object list(string sWhere, string Organization)
        {
            try
            {
@@ -39,22 +39,11 @@
                    string sql = sql1 + sWhere + " order by HItemID desc";
                    ds = oCN.RunProcReturn(sql, "h_v_Gy_CustomerList");
                }
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "false！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                else
                {
                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = "Sucess！";
                    objJsonResult.data = ds.Tables[0];
                    return objJsonResult;
                }
                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess！";
                objJsonResult.data = ds.Tables[0];
                return objJsonResult;
            }
            catch (Exception e)
            {