From f5bb218bb36f37445d06451f51795d131f85badb Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期三, 20 十月 2021 08:39:13 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/BaseSet/Xt_ORGANIZATIONSController.cs | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/WebAPI/Controllers/BaseSet/Xt_ORGANIZATIONSController.cs b/WebAPI/Controllers/BaseSet/Xt_ORGANIZATIONSController.cs
index c064d67..6baaaa8 100644
--- a/WebAPI/Controllers/BaseSet/Xt_ORGANIZATIONSController.cs
+++ b/WebAPI/Controllers/BaseSet/Xt_ORGANIZATIONSController.cs
@@ -25,19 +25,18 @@
/// </summary>
[Route("Xt_ORGANIZATIONS/list")]
[HttpGet]
- public object list(string sWhere)
+ public object list(string sWhere,string Organization)
{
try
-
{
+ string sql1 = string.Format(@"select * from h_v_IF_ORGANIZATIONSList where 缁勭粐鍚嶇О='" + Organization + "'");
if (sWhere == null || sWhere.Equals(""))
{
- ds = oCN.RunProcReturn("select * from h_v_IF_ORGANIZATIONSList " + sWhere, "h_v_IF_ORGANIZATIONSList");
+ ds = oCN.RunProcReturn(sql1 + sWhere + "order by HItemID desc", "h_v_IF_ORGANIZATIONSList");
}
else
{
- string sql1 = "select * from h_v_IF_ORGANIZATIONSList where 1 = 1 ";
- string sql = sql1 + sWhere;
+ string sql = sql1 + sWhere + "order by HItemID desc";
ds = oCN.RunProcReturn(sql, "h_v_IF_ORGANIZATIONSList");
}
if (ds == null || ds.Tables[0].Rows.Count == 0)
--
Gitblit v1.9.1