From b67b1c28ef34c89cd1420ad5c414533658bc7206 Mon Sep 17 00:00:00 2001
From: YL <YL@LAPTOP-SE03PLUR>
Date: 星期一, 07 二月 2022 22:09:09 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

---
 WebAPI/Controllers/BaseSet/Gy_SourceController.cs |   52 +++++++++++++++++++++++++++++++++++++---------------
 1 files changed, 37 insertions(+), 15 deletions(-)

diff --git a/WebAPI/Controllers/BaseSet/Gy_SourceController.cs b/WebAPI/Controllers/BaseSet/Gy_SourceController.cs
index c61d537..bf1011e 100644
--- a/WebAPI/Controllers/BaseSet/Gy_SourceController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_SourceController.cs
@@ -28,17 +28,27 @@
         /// </summary>
         [Route("Gy_Source/list")]
         [HttpGet]
-        public object list(string sWhere)
+        public object list(string sWhere,string user)
         {
             try
             {
+                //鍒ゆ柇鏄惁鏈夋煡璇㈡潈闄�
+                if (!DBUtility.ClsPub.Security_Log("Gy_Source_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_SourceList where 绂佺敤鏍囪='' ", "h_v_IF_SourceList");
+                    ds = oCN.RunProcReturn("select * from h_v_IF_SourceList where 1=1 ", "h_v_IF_SourceList");
                 }
                 else
                 {
-                    string sql1 = "select * from h_v_IF_SourceList where 绂佺敤鏍囪='' ";
+                    string sql1 = "select * from h_v_IF_SourceList where 1=1 ";
                     string sql = sql1 + sWhere;
                     ds = oCN.RunProcReturn(sql, "h_v_IF_SourceList");
                 }
@@ -80,10 +90,22 @@
         {
             DataSet ds;
             var _value = msg["msg"].ToString();
-            string msg1 = _value.ToString();
-            //string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+            string[] sArray = _value.ToString().Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+            string msg1 = sArray[0].ToString();
+            string user = sArray[1].ToString();
             //string msg2 = sArray[0].ToString();
             //string msg3 = sArray[1].ToString();
+
+            //鍒ゆ柇鏄惁鏈夌紪杈戞潈闄�
+            if (!DBUtility.ClsPub.Security_Log("Gy_Source_Edit", 1, false, user))
+            {
+                objJsonResult.code = "0";
+                objJsonResult.count = 0;
+                objJsonResult.Message = "鏃犳潈闄愮紪杈�!";
+                objJsonResult.data = null;
+                return objJsonResult;
+            }
+
             Int64 HItemID = 0;
             SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
             //鑾峰彇鏈�澶D鍊艰祴鍊�
@@ -280,21 +302,21 @@
         /// <returns></returns>
         [Route("DeltetGy_Source")]
         [HttpGet]
-        public object DeltetGy_Source(string HItemID)
+        public object DeltetGy_Source(string HItemID,string user)
         {
             DataSet ds;
-            //string ModRightNameCheck = "Sc_ProcessReport_check";
+            string ModRightNameCheck = "Gy_Source_Delete";
             try
             {
                 //鍒犻櫎鏉冮檺
-                //if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName))
-                //{
-                //    objJsonResult.code = "0";
-                //    objJsonResult.count = 0;
-                //    objJsonResult.Message = "瀹℃牳澶辫触锛佹棤鏉冮檺锛�";
-                //    objJsonResult.data = null;
-                //    return objJsonResult;
-                //}
+                if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, false, user))
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "瀹℃牳澶辫触锛佹棤鏉冮檺锛�";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
 
                 SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
                 if (string.IsNullOrWhiteSpace(HItemID))

--
Gitblit v1.9.1