From 1cf37e52dcefd6bbf567818b50e16f36c7fae84c Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期四, 30 六月 2022 08:42:55 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/BaseSet/Gy_UnitController.cs | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/WebAPI/Controllers/BaseSet/Gy_UnitController.cs b/WebAPI/Controllers/BaseSet/Gy_UnitController.cs
index 35b155e..ee5f95b 100644
--- a/WebAPI/Controllers/BaseSet/Gy_UnitController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_UnitController.cs
@@ -44,19 +44,19 @@
string sql1 = string.Format(@"select * from h_v_Gy_UnitList where 绂佺敤鏍囪='' and 缁勭粐鍚嶇О='" + Organization + "'");
if (sWhere == null || sWhere.Equals(""))
{
- ds = oCN.RunProcReturn(sql1 + sWhere + "order by HItemID desc", "h_v_Gy_UnitList");
+ ds = oCN.RunProcReturn(sql1 + sWhere + "order by 璁￠噺鍗曚綅浠ｇ爜 ", "h_v_Gy_UnitList");
}
else
{
- string sql = sql1 + sWhere + "order by HItemID desc";
+ string sql = sql1 + sWhere + "order by 璁￠噺鍗曚綅浠ｇ爜 ";
ds = oCN.RunProcReturn(sql, "h_v_Gy_UnitList");
}
- 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)
{
--
Gitblit v1.9.1