From a5b7843bbda42aea3e24f0a519679b6cc8f3ee72 Mon Sep 17 00:00:00 2001
From: 杨乐 <yang.le.192@qq.com>
Date: 星期五, 11 二月 2022 17:55:26 +0800
Subject: [PATCH] 权限编辑 2727 不良品处理

---
 WebAPI/Controllers/BaseSet/Gy_GroupController.cs |   81 +++++++++++++++++++++++++++++-----------
 1 files changed, 59 insertions(+), 22 deletions(-)

diff --git a/WebAPI/Controllers/BaseSet/Gy_GroupController.cs b/WebAPI/Controllers/BaseSet/Gy_GroupController.cs
index 12eeffb..26c7b7f 100644
--- a/WebAPI/Controllers/BaseSet/Gy_GroupController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_GroupController.cs
@@ -26,18 +26,28 @@
         /// </summary>
         [Route("Gy_Group/list")]
         [HttpGet]
-        public object list(string sWhere)
+        public object list(string sWhere,string user)
         {
             try
             {
+                //鏌ョ湅鏉冮檺
+                if (!DBUtility.ClsPub.Security_Log("Gy_Group_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_GroupList " + sWhere, "h_v_GroupList");
+                    ds = oCN.RunProcReturn("select * from h_v_GroupList " + sWhere+ " order by 鐝粍浠g爜 ", "h_v_GroupList");
                 }
                 else
                 {
                     string sql1 = "select * from h_v_GroupList where 1 = 1 ";
-                    string sql = sql1 + sWhere;
+                    string sql = sql1 + sWhere+ " order by 鐝粍浠g爜 ";
                     ds = oCN.RunProcReturn(sql, "h_v_GroupList");
                 }
                 if (ds == null || ds.Tables[0].Rows.Count == 0)
@@ -146,10 +156,26 @@
             {
                 var _value = oMain["oMain"].ToString();
                 string msg1 = _value.ToString();
+                string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+                string msg2 = sArray[0].ToString();
+                string msg3 = sArray[1].ToString();
+                string msg4 = sArray[2].ToString();
+                string msg5 = sArray[3].ToString();
+
+                //鍒ゆ柇鏉冮檺
+                if (!ClsPub.Security_Log(msg5, 1, false, msg4))
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "鏃犱繚瀛樻潈闄�";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+
                 //鍙嶅簭鍒楀寲
-                msg1 = "[" + msg1.ToString() + "]";
+                msg2 = "[" + msg2.ToString() + "]";
                 DAL.ClsGy_Group_Ctl oDept = new DAL.ClsGy_Group_Ctl();
-                List<Gy_Group> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_Group>>(msg1);
+                List<Gy_Group> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_Group>>(msg2);
                 long HItemID = list[0].HItemID;
                 string HNumber = list[0].HNumber;
                 string HName = list[0].HName;
@@ -227,9 +253,20 @@
                 string msg1 = _value.ToString();
                 string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
                 string msg2 = sArray[0].ToString();
-                //string msg3 = sArray[1].ToString();
+                string user = sArray[1].ToString();//鐢ㄦ埛鍚�
                 //string msg4 = sArray[2].ToString();
                 //string msg5 = sArray[3].ToString();
+
+                //鍒ゆ柇鏄惁鏈夌紪杈戞潈闄�
+                if (!DBUtility.ClsPub.Security_Log("Gy_Group_Edit", 1, false, user))
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "鏃犵紪杈戞潈闄�!";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+
                 //鍙嶅簭鍒楀寲
                 msg2 = "[" + msg2.ToString() + "]";
                 List<Gy_Group> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Gy_Group>>(msg2);
@@ -253,12 +290,12 @@
                 long HLevel = 1;
                 //var HProcID = "";
 
-                ////鍒ゆ柇鏉冮檺
-                //if (!ClsPub.Security_Log(msg5, 1, true, msg4))
+                //鍒ゆ柇鏉冮檺
+                //if (!ClsPub.Security_Log(msg5, 1, false, msg4))
                 //{
                 //    objJsonResult.code = "0";
                 //    objJsonResult.count = 0;
-                //    objJsonResult.Message = "娌℃湁鎵惧埌璇ュ姛鑳芥ā鍧楋紒";
+                //    objJsonResult.Message = "鏃犱繚瀛樻潈闄�";
                 //    objJsonResult.data = null;
                 //    return objJsonResult;
                 //}
@@ -365,7 +402,7 @@
         //        var HProcID = list[0].HProcID;
 
         //        //鍒ゆ柇鏉冮檺
-        //        //if (!ClsPub.Security_Log(msg5, 1, true, msg4))
+        //        //if (!ClsPub.Security_Log(msg5, 1, false, msg4))
         //        //{
         //        //    objJsonResult.code = "0";
         //        //    objJsonResult.count = 0;
@@ -430,24 +467,24 @@
         /// 鐝粍鍒犻櫎鍔熻兘
         /// </summary>
         /// <returns></returns>
-        [Route("DeltetGy_Group")]
+        [Route("Gy_Group/DeltetGy_Group")]
         [HttpGet]
-        public object DeltetGy_Group(string HItemID)
+        public object DeltetGy_Group(string HItemID,string user)
         {
             DataSet ds;
             DataSet ds1;
-            //string ModRightNameCheck = "Sc_ProcessReport_check";
+            string ModRightNameCheck = "Gy_Group_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("Gy_Group_Delete", 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))
@@ -558,7 +595,7 @@
             DAL.ClsGy_Group_View oDeptHlp = new DAL.ClsGy_Group_View();
             try
             {
-                if (!DBUtility.ClsPub.Security_Log(ModRightNameDelete, 1, true, User))
+                if (!DBUtility.ClsPub.Security_Log(ModRightNameDelete, 1, false, User))
                 {
                     objJsonResult.code = "0";
                     objJsonResult.count = 0;

--
Gitblit v1.9.1