From fa930a0008d9c3fa3fcd5e0bac6d8fe812059479 Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期五, 21 一月 2022 17:30:44 +0800
Subject: [PATCH] 器具设备工资权限

---
 WebAPI/Controllers/BaseSet/Gy_UnitController.cs |   22 ++++++----------------
 1 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/WebAPI/Controllers/BaseSet/Gy_UnitController.cs b/WebAPI/Controllers/BaseSet/Gy_UnitController.cs
index a4c4166..8aa4810 100644
--- a/WebAPI/Controllers/BaseSet/Gy_UnitController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_UnitController.cs
@@ -27,36 +27,26 @@
         /// </summary>
         [Route("Gy_Unit/list1")]
         [HttpGet]
-        public object list(string sWhere)
+        public object list(string sWhere,string Organization)
         {
             try
             {
+                string sql1 = string.Format(@"select * from h_v_Gy_UnitList where 绂佺敤鏍囪='' and 缁勭粐鍚嶇О='" + Organization + "'");
                 if (sWhere == null || sWhere.Equals(""))
                 {
-                    ds = oCN.RunProcReturn("select * from h_v_Gy_UnitList where 绂佺敤鏍囪=''  ", "h_v_Gy_UnitList");
+                    ds = oCN.RunProcReturn(sql1 + sWhere + "order by HItemID desc", "h_v_Gy_UnitList");
                 }
                 else
                 {
-                    string sql1 = "select * from h_v_Gy_UnitList where 绂佺敤鏍囪='' ";
-                    string sql = sql1 + sWhere;
+                    string sql = sql1 + sWhere + "order by HItemID desc";
                     ds = oCN.RunProcReturn(sql, "h_v_Gy_UnitList");
                 }
-                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;
-                }
+                
             }
             catch (Exception e)
             {
@@ -312,7 +302,7 @@
             try
             {
                 //鍒犻櫎鏉冮檺
-                //if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName))
+                //if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, false, CurUserName))
                 //{
                 //    objJsonResult.code = "0";
                 //    objJsonResult.count = 0;

--
Gitblit v1.9.1