From 2de7af1c4b432e39047852b62b6c3ec788fef8ba Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期三, 03 八月 2022 17:29:00 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API into master
---
WebAPI/Controllers/BaseSet/Gy_OrderLevController.cs | 37 +++++++++++++++++++------------------
1 files changed, 19 insertions(+), 18 deletions(-)
diff --git a/WebAPI/Controllers/BaseSet/Gy_OrderLevController.cs b/WebAPI/Controllers/BaseSet/Gy_OrderLevController.cs
index 9839763..4ca1e3a 100644
--- a/WebAPI/Controllers/BaseSet/Gy_OrderLevController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_OrderLevController.cs
@@ -43,30 +43,31 @@
if (sWhere == null || sWhere.Equals(""))
{
- ds = oCN.RunProcReturn("select * from h_v_Gy_OrderLevList " + sWhere, "h_v_Gy_OrderLevList");
+ ds = oCN.RunProcReturn("select * from h_v_Gy_OrderLevList " + sWhere+ " order by 璁㈠崟绛夌骇浠ｇ爜", "h_v_Gy_OrderLevList");
}
else
{
string sql1 = "select * from h_v_Gy_OrderLevList where 1 = 1 ";
- string sql = sql1 + sWhere;
+ string sql = sql1 + sWhere+ " order by 璁㈠崟绛夌骇浠ｇ爜";
ds = oCN.RunProcReturn(sql, "h_v_Gy_OrderLevList");
}
- if (ds == null || ds.Tables[0].Rows.Count == 0)
- {
- objJsonResult.code = "0";
- objJsonResult.count = 0;
- objJsonResult.Message = "false锛�";
- objJsonResult.data = null;
- return objJsonResult;
- }
- else
- {
- objJsonResult.code = "1";
- objJsonResult.count = 1;
- objJsonResult.Message = "Sucess锛�";
- objJsonResult.data = ds.Tables[0];
- return objJsonResult;
- }
+
+ //if (ds.Tables[0].Rows.Count != 0 || ds != null)
+ //{
+ objJsonResult.code = "1";
+ objJsonResult.count = 1;
+ objJsonResult.Message = "Sucess锛�";
+ objJsonResult.data = ds.Tables[0];
+ return objJsonResult;
+ //}
+ //else
+ //{
+ //objJsonResult.code = "0";
+ //objJsonResult.count = 0;
+ //objJsonResult.Message = "鏃犳暟鎹�";
+ //objJsonResult.data = null;
+ //return objJsonResult;
+ //}
}
catch (Exception e)
{
--
Gitblit v1.9.1