From 11099336f48a1a160a7aaf0e3c8c82d0f79ce332 Mon Sep 17 00:00:00 2001
From: 王 垚 <1402714037@qq.com>
Date: 星期二, 19 十月 2021 15:50:16 +0800
Subject: [PATCH] nothing

---
 WebAPI/Controllers/MJGL/Sc_MouldProdInBillController.cs |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/WebAPI/Controllers/MJGL/Sc_MouldProdInBillController.cs b/WebAPI/Controllers/MJGL/Sc_MouldProdInBillController.cs
index 2ab96e1..c4b5b1d 100644
--- a/WebAPI/Controllers/MJGL/Sc_MouldProdInBillController.cs
+++ b/WebAPI/Controllers/MJGL/Sc_MouldProdInBillController.cs
@@ -23,12 +23,12 @@
 
         [Route("Sc_MouldProdInBill/Get_MouldProdInBillList")]
         [HttpGet]
-        public object Get_MouldProdInBillList(string sWhere,string user)
+        public object Get_MouldProdInBillList(string sWhere,string user, string Organization)
         {
             try
             {
                 //缂栬緫鏉冮檺
-                if (!DBUtility.ClsPub.Security_Log("Sc_MouldProdInBillList", 1, true, user))
+                if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldProdInBillList", 1, true, user))
                 {
                     objJsonResult.code = "0";
                     objJsonResult.count = 0;
@@ -37,7 +37,7 @@
                     return objJsonResult;
                 }
 
-                ds = Sc_GetMouldProdInHouseBill(sWhere);
+                ds = Sc_GetMouldProdInHouseBill(sWhere,Organization);
                 if (ds == null)
                 {
                     objJsonResult.code = "0";
@@ -65,15 +65,15 @@
             }
         }
 
-        public static DataSet Sc_GetMouldProdInHouseBill(string sWhere)
+        public static DataSet Sc_GetMouldProdInHouseBill(string sWhere, string Organization)
         {
+            string sql1 = string.Format(@"select * from h_v_Sc_MouldProdInHouseBillList where 搴撳瓨缁勭粐='" + Organization + "'");
             if (sWhere == null || sWhere.Equals(""))
             {
-                return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Sc_MouldProdInHouseBillList order by 鏃ユ湡 desc " + sWhere, "h_v_Sc_MouldProdInHouseBillList");
+                return new SQLHelper.ClsCN().RunProcReturn(sql1+ sWhere + "order by 鏃ユ湡 desc", "h_v_Sc_MouldProdInHouseBillList");
             }
             else
             {
-                string sql1 = "select * from h_v_Sc_MouldProdInHouseBillList where 1 = 1 ";
                 string sql = sql1 + sWhere+ "order by 鏃ユ湡 desc";
                 return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldProdInHouseBillList");
             }
@@ -92,7 +92,7 @@
         public object set_DeleteBill(string HInterID,string user)
         {
             //缂栬緫鏉冮檺
-            if (!DBUtility.ClsPub.Security_Log("Sc_MouldProdInBill_Delete", 1, true, user))
+            if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldProdInBill_Delete", 1, true, user))
             {
                 objJsonResult.code = "0";
                 objJsonResult.count = 0;
@@ -186,7 +186,7 @@
             try
             {
                 //瀹℃牳鏉冮檺
-                if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName))
+                if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, true, CurUserName))
                 {
                     objJsonResult.code = "0";
                     objJsonResult.count = 0;
@@ -293,7 +293,7 @@
             try
             {
                 //瀹℃牳鏉冮檺
-                if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName))
+                if (!DBUtility.ClsPub.Security_Log_second(ModRightNameCheck, 1, true, CurUserName))
                 {
                     objJsonResult.code = "0";
                     objJsonResult.count = 0;
@@ -478,7 +478,7 @@
             try
             {
                 //缂栬緫鏉冮檺
-                if (!DBUtility.ClsPub.Security_Log("Sc_MouldProdInBill_Edit", 1, true, msg4))
+                if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldProdInBill_Edit", 1, true, msg4))
                 {
                     objJsonResult.code = "0";
                     objJsonResult.count = 0;

--
Gitblit v1.9.1