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

zrg

2024-04-24 f724d68a09d8f363be4a50bb7e2db25dcd87b0bd

 WebAPI/Controllers/BaseSet/Xt_ORGANIZATIONSController.cs

@@ -40,7 +40,8 @@
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                string sql1 = string.Format(@"select * from h_v_IF_ORGANIZATIONSList where 组织名称='" + Organization + "'");
                //string sql1 = string.Format(@"select * from h_v_IF_ORGANIZATIONSList where 组织名称='" + Organization + "'");
                string sql1 = string.Format(@"select * from h_v_IF_ORGANIZATIONSList where 1=1 ");
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn(sql1 + sWhere + " order by 组织代码 ", "h_v_IF_ORGANIZATIONSList");