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

ch

2022-07-31 cee2c78bdc4aa9f309b68bc489c97282c9b7cb65

 WebAPI/Controllers/BaseSet/Xt_ORGANIZATIONSController.cs

@@ -41,13 +41,14 @@
                string sql1 = string.Format(@"select * from h_v_IF_ORGANIZATIONSList where 组织名称='" + Organization + "'");
                if (sWhere == null || sWhere.Equals(""))
                {
                    ds = oCN.RunProcReturn(sql1 + sWhere + "order by HItemID desc", "h_v_IF_ORGANIZATIONSList");
                    ds = oCN.RunProcReturn(sql1 + sWhere + " order by 组织代码 ", "h_v_IF_ORGANIZATIONSList");
                }
                else
                {
                    string sql = sql1 + sWhere + "order by HItemID desc";
                    string sql = sql1 + sWhere + " order by 组织代码 ";
                    ds = oCN.RunProcReturn(sql, "h_v_IF_ORGANIZATIONSList");
                }

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess！";