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_DepartmentController.cs |   45 ++++++++++++++++++++++++++++++++-------------
 1 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/WebAPI/Controllers/BaseSet/Gy_DepartmentController.cs b/WebAPI/Controllers/BaseSet/Gy_DepartmentController.cs
index e9a1c8e..6dca5a2 100644
--- a/WebAPI/Controllers/BaseSet/Gy_DepartmentController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_DepartmentController.cs
@@ -25,18 +25,27 @@
         /// </summary>
         [Route("Gy_Department/list")]
         [HttpGet]
-        public object list(string sWhere,string Organization)
+        public object list(string sWhere,string user,string Organization)
         {
             try
             {
+                //鏌ョ湅鏉冮檺
+                if (!DBUtility.ClsPub.Security_Log("Gy_Department", 1, false, user))
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "鏃犳煡鐪嬫潈闄�";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
                 string sql1 = string.Format(@"select * from h_v_IF_DepartmentList where 缁勭粐鍚嶇О='" + Organization + "'");
                 if (sWhere == null || sWhere.Equals(""))
                 {
-                    ds = oCN.RunProcReturn(sql1 + sWhere + "order by HItemID desc", "h_v_IF_DepartmentList");
+                    ds = oCN.RunProcReturn(sql1 + sWhere + "order by 閮ㄩ棬浠g爜", "h_v_IF_DepartmentList");
                 }
                 else
                 {
-                    string sql = sql1 + sWhere + "order by HItemID desc";
+                    string sql = sql1 + sWhere + "order by 閮ㄩ棬浠g爜 ";
                     ds = oCN.RunProcReturn(sql, "h_v_IF_DepartmentList");
                 }
 
@@ -103,21 +112,21 @@
         /// <returns></returns>
         [Route("DeltetGy_Department")]
         [HttpGet]
-        public object DeltetGy_Department(string HItemID)
+        public object DeltetGy_Department(string HItemID,string user)
         {
             DataSet ds;
             DataSet ds1;
             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_Department_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))
@@ -368,6 +377,16 @@
                 string msg3 = sArray[1].ToString();
                 //string msg4 = sArray[2].ToString();
                 //string msg5 = sArray[3].ToString();
+                
+                //缂栬緫鏉冮檺
+                if (!DBUtility.ClsPub.Security_Log_second("Gy_Department_Edit", 1, false, msg3))
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "鏃犱繚瀛樻潈闄愶紒";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
                 //鍙嶅簭鍒楀寲
                 msg2 = "[" + msg2.ToString() + "]";
                 List<Department> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Department>>(msg2);
@@ -400,7 +419,7 @@
                 long HEntityID = 1;
 
                 //鍒ゆ柇鏉冮檺
-                //if (!ClsPub.Security_Log(msg5, 1, true, msg4))
+                //if (!ClsPub.Security_Log(msg5, 1, false, msg4))
                 //{
                 //    objJsonResult.code = "0";
                 //    objJsonResult.count = 0;

--
Gitblit v1.9.1