From 5d9636ba5741f6ff79c9401bce2626469c35323d Mon Sep 17 00:00:00 2001
From: ch <37327@LLOOCCY>
Date: 星期四, 10 三月 2022 15:07:14 +0800
Subject: [PATCH] 合并

---
 WebAPI/Controllers/BaseSet/Gy_OrderBackInfoController.cs |   37 +++++++++++++++++++------------------
 1 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/WebAPI/Controllers/BaseSet/Gy_OrderBackInfoController.cs b/WebAPI/Controllers/BaseSet/Gy_OrderBackInfoController.cs
index 14bef06..b8d26b8 100644
--- a/WebAPI/Controllers/BaseSet/Gy_OrderBackInfoController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_OrderBackInfoController.cs
@@ -42,30 +42,31 @@
                 }
                 if (sWhere == null || sWhere.Equals(""))
                 {
-                    ds = oCN.RunProcReturn("select * from h_v_Gy_OrderBackInfoList " + sWhere, "h_v_Gy_OrderBackInfoList");
+                    ds = oCN.RunProcReturn("select * from h_v_Gy_OrderBackInfoList " + sWhere+ " order by 鍙嶉鐘舵�佷唬鐮�", "h_v_Gy_OrderBackInfoList");
                 }
                 else
                 {
                     string sql1 = "select * from h_v_Gy_OrderBackInfoList where 1 = 1 ";
-                    string sql = sql1 + sWhere;
+                    string sql = sql1 + sWhere+ " order by 鍙嶉鐘舵�佷唬鐮�";
                     ds = oCN.RunProcReturn(sql, "h_v_Gy_OrderBackInfoList");
                 }
-                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