From dac1d793ad118eebf9048588a356ae0ea8a3aa95 Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期四, 10 二月 2022 17:42:41 +0800
Subject: [PATCH] 基础建模每个模块的权限

---
 WebAPI/Controllers/BaseSet/Gy_MaterialController.cs |   24 +++++++++++++++++-------
 1 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs b/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
index 5d086a8..778181b 100644
--- a/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
@@ -43,11 +43,11 @@
                 string sql1 = string.Format(@"select * from h_v_Gy_MaterialList where 缁勭粐鍚嶇О='" + Organization + "'");
                 if (sWhere == null || sWhere.Equals(""))
                 {
-                    ds = oCN.RunProcReturn(sql1 + sWhere + "order by HItemID desc", "h_v_Gy_MaterialList");
+                    ds = oCN.RunProcReturn(sql1 + sWhere + " order by 鐗╂枡浠g爜 ", "h_v_Gy_MaterialList");
                 }
                 else
                 {
-                    string sql = sql1 + sWhere + "order by HItemID desc";
+                    string sql = sql1 + sWhere + " order by 鐗╂枡浠g爜 ";
                     ds = oCN.RunProcReturn(sql, "h_v_Gy_MaterialList");
                 }
 
@@ -383,12 +383,12 @@
                 }
                 if (sWhere == null || sWhere.Equals(""))
                 {
-                    ds = oCN.RunProcReturn("select * from h_v_Gy_MouldFileList " + sWhere + "order by 鏃ユ湡 desc", "h_v_Gy_MouldFileList");
+                    ds = oCN.RunProcReturn("select * from h_v_Gy_MouldFileList " + sWhere + "order by hmainid desc", "h_v_Gy_MouldFileList");
                 }
                 else
                 {
                     string sql1 = "select * from h_v_Gy_MouldFileList where 1 = 1 ";
-                    string sql = sql1 + sWhere + "order by 鏃ユ湡 desc";
+                    string sql = sql1 + sWhere + "order by hmainid desc";
                     ds = oCN.RunProcReturn(sql, "h_v_Gy_MouldFileList");
                 }
                 if (ds == null || ds.Tables[0].Rows.Count == 0)
@@ -477,18 +477,28 @@
         /// </summary>
         [Route("Gy_BarCodeBillList/GetBarCodeBillList")]
         [HttpGet]
-        public object GetBarCodeBillList(string sWhere)
+        public object GetBarCodeBillList(string sWhere,string user)
         {
             try
             {
+                //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+                if (!DBUtility.ClsPub.Security_Log("Gy_BarCodeBill_Query", 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_IF_BarCodeBillList " + sWhere + "order by 鏃ユ湡 desc", "h_v_IF_BarCodeBillList");
+                    ds = oCN.RunProcReturn("select * from h_v_IF_BarCodeBillList order by hmainid desc", "h_v_IF_BarCodeBillList");
                 }
                 else
                 {
                     string sql1 = "select * from h_v_IF_BarCodeBillList where 1 = 1 ";
-                    string sql = sql1 + sWhere + "order by 鏃ユ湡 desc";
+                    string sql = sql1 + sWhere + "order by hmainid desc";
                     ds = oCN.RunProcReturn(sql, "h_v_IF_BarCodeBillList");
                 }
                 if (ds == null || ds.Tables[0].Rows.Count == 0)

--
Gitblit v1.9.1