From 70e0952a3a7722904a21a5b514f18c7899359ef7 Mon Sep 17 00:00:00 2001
From: ch <37327@LLOOCCY>
Date: 星期五, 29 十月 2021 17:22:32 +0800
Subject: [PATCH] 合并

---
 WebAPI/Controllers/BaseSet/Gy_DepartmentController.cs |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/WebAPI/Controllers/BaseSet/Gy_DepartmentController.cs b/WebAPI/Controllers/BaseSet/Gy_DepartmentController.cs
index 2091013..e9a1c8e 100644
--- a/WebAPI/Controllers/BaseSet/Gy_DepartmentController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_DepartmentController.cs
@@ -25,18 +25,18 @@
         /// </summary>
         [Route("Gy_Department/list")]
         [HttpGet]
-        public object list(string sWhere)
+        public object list(string sWhere,string Organization)
         {
             try
             {
+                string sql1 = string.Format(@"select * from h_v_IF_DepartmentList where 缁勭粐鍚嶇О='" + Organization + "'");
                 if (sWhere == null || sWhere.Equals(""))
                 {
-                    ds = oCN.RunProcReturn("select * from h_v_IF_DepartmentList " + sWhere, "h_v_IF_DepartmentList");
+                    ds = oCN.RunProcReturn(sql1 + sWhere + "order by HItemID desc", "h_v_IF_DepartmentList");
                 }
                 else
                 {
-                    string sql1 = "select * from h_v_IF_DepartmentList where 1 = 1 ";
-                    string sql = sql1 + sWhere;
+                    string sql = sql1 + sWhere + "order by HItemID desc";
                     ds = oCN.RunProcReturn(sql, "h_v_IF_DepartmentList");
                 }
 

--
Gitblit v1.9.1