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

zzr99

2021-11-12 bf3ccf84ff0ed2576052cb0b34659aea363626b5

 WebAPI/Controllers/BaseSet/Gy_EmployeeController.cs

@@ -27,18 +27,18 @@
        /// </summary>
        [Route("Gy_Employee/list")]
        [HttpGet]
        public object list(string sWhere)
        public object list(string sWhere,string Organization)
        {
            try
            {
                string sql1 = string.Format(@"select * from h_v_IF_EmployeeList where 组织名称='" + Organization + "'");
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn("select * from h_v_IF_EmployeeList  where  禁用标记='' ", "h_v_IF_EmployeeList");
                    ds = oCN.RunProcReturn(sql1 + sWhere + "order by HItemID desc", "h_v_IF_EmployeeList");
                }
                else
                {
                    string sql1 = "select * from h_v_IF_EmployeeList where 禁用标记='' ";
                    string sql = sql1 + sWhere;
                    string sql = sql1 + sWhere + "order by HItemID desc";
                    ds = oCN.RunProcReturn(sql, "h_v_IF_EmployeeList");
                }
                objJsonResult.code = "1";