From d025fb7f76a203f3d29f7041611115a00f7a010c Mon Sep 17 00:00:00 2001
From: 杨乐 <yang.le.192@qq.com>
Date: 星期一, 14 二月 2022 16:19:14 +0800
Subject: [PATCH] 无数据的情况下去掉提示,直接显示无数据的列表,且带出操作工具栏

---
 WebAPI/Controllers/GZGL/Gy_DuSubsidyItemBillController.cs |   72 +++++++++++++++++++++++++-----------
 1 files changed, 50 insertions(+), 22 deletions(-)

diff --git a/WebAPI/Controllers/GZGL/Gy_DuSubsidyItemBillController.cs b/WebAPI/Controllers/GZGL/Gy_DuSubsidyItemBillController.cs
index 8163f59..29427d5 100644
--- a/WebAPI/Controllers/GZGL/Gy_DuSubsidyItemBillController.cs
+++ b/WebAPI/Controllers/GZGL/Gy_DuSubsidyItemBillController.cs
@@ -28,36 +28,46 @@
         /// </summary>
         [Route("Gy_DuSubsidyItemBill/Gy_DuSubsidyItemlist")]
         [HttpGet]
-        public object Gy_DuSubsidyItemlist(string sWhere)
+        public object Gy_DuSubsidyItemlist(string sWhere,string user)
         {
             try
             {
+                if (!DBUtility.ClsPub.Security_Log("Gy_DuSubsidyItem", 1, false, user))
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "鏃犳煡鐪嬫潈闄愶紒";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+
                 if (sWhere == null || sWhere.Equals(""))
                 {
-                    ds = oCN.RunProcReturn("select * from h_v_Gy_DuSubsidyItemList " + sWhere, "h_v_Gy_DuSubsidyItemList");
+                    ds = oCN.RunProcReturn("select * from h_v_Gy_DuSubsidyItemList order by 鎵hˉ璧勬枡浠g爜  ", "h_v_Gy_DuSubsidyItemList");
                 }
                 else
                 {
                     string sql1 = "select * from h_v_Gy_DuSubsidyItemList where 1 = 1 ";
-                    string sql = sql1 + sWhere;
+                    string sql = sql1 + sWhere+ " order by 鎵hˉ璧勬枡浠g爜  ";
                     ds = oCN.RunProcReturn(sql, "h_v_Gy_DuSubsidyItemList");
                 }
-                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)
             {
@@ -70,16 +80,25 @@
         }
         #endregion
 
-        #region 鍒犻櫎宸ヨ祫绫诲瀷
+        #region 鎵hˉ椤圭洰鍒犻櫎
         /// <summary>
-        /// 宸ヨ祫绫诲瀷鍒楄〃鍒犻櫎鎸夐挳
+        /// 鎵hˉ椤圭洰鍒犻櫎鎸夐挳
         ///鍙傛暟锛歴tring sql銆�
         ///杩斿洖鍊硷細object銆�
         /// </summary>
         [Route("Gy_DuSubsidyItemBill/Delete_Json")]
         [HttpGet]
-        public object Delete_Json(string HInterID)
+        public object Delete_Json(string HInterID,string user)
         {
+            if (!DBUtility.ClsPub.Security_Log("Gy_DuSubsidyItem_Delete", 1, false, user))
+            {
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒";
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+
             //鐢╥d鏌ュ埌璇ュ璞�
             string sql = "select * from Gy_DuSubsidyItem where HItemID =  " + HInterID;
             ds = oCN.RunProcReturn(sql, "Gy_DuSubsidyItem");
@@ -160,11 +179,20 @@
             string msg1 = _value.ToString();
             string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
             string msg2 = sArray[0].ToString();
+            string msg3 = sArray[1].ToString();
 
             ListModels oListModels = new ListModels();
 
             try
             {
+                if (!DBUtility.ClsPub.Security_Log("Gy_DuSubsidyItem_Edit", 1, false, msg3))
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
                 DLL.ClsGy_DuSubsidyItemBill oBill = new DLL.ClsGy_DuSubsidyItemBill();
                 List<Model.ClsGy_DuSubsidyItem_Model> lsmain = new List<Model.ClsGy_DuSubsidyItem_Model>();
                 msg2 = msg2.Replace("\\", "");

--
Gitblit v1.9.1