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_CheckItemController.cs |   58 ++++++++++++++++++++++++++++++++++------------------------
 1 files changed, 34 insertions(+), 24 deletions(-)

diff --git a/WebAPI/Controllers/BaseSet/Gy_CheckItemController.cs b/WebAPI/Controllers/BaseSet/Gy_CheckItemController.cs
index 2fbc50f..96e7835 100644
--- a/WebAPI/Controllers/BaseSet/Gy_CheckItemController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_CheckItemController.cs
@@ -27,18 +27,28 @@
         /// </summary>
         [Route("Gy_CheckItem/list")]
         [HttpGet]
-        public object list(string sWhere)
+        public object list(string sWhere,string user)
         {
             try
             {
+                //鏌ョ湅鏉冮檺
+                if (!DBUtility.ClsPub.Security_Log("Gy_QCCheckItem_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_QCCheckItemList " + sWhere, "h_v_IF_QCCheckItemList");
+                    ds = oCN.RunProcReturn("select * from h_v_IF_QCCheckItemList  order by 浠g爜", "h_v_IF_QCCheckItemList");
                 }
                 else
                 {
                     string sql1 = "select * from h_v_IF_QCCheckItemList where 1 = 1 ";
-                    string sql = sql1 + sWhere;
+                    string sql = sql1 + sWhere+ " order by 浠g爜";
                     ds = oCN.RunProcReturn(sql, "h_v_IF_QCCheckItemList");
                 }
                 if (ds == null || ds.Tables[0].Rows.Count == 0)
@@ -126,14 +136,16 @@
             DAL.ClsGy_QCCheckItem_View oDeptHlp = new DAL.ClsGy_QCCheckItem_View();
             try
             {
-                //if (!DBUtility.ClsPub.Security_Log(ModRightNameDelete, 1, false, User))
-                //{
-                //    objJsonResult.code = "0";
-                //    objJsonResult.count = 0;
-                //    objJsonResult.Message = "娌℃湁鍒犻櫎鏉冮檺";
-                //    objJsonResult.data = null;
-                //    return objJsonResult;
-                //}
+                //鍒ゆ柇鏄惁鏈夊垹闄ゆ潈闄�
+                if (!DBUtility.ClsPub.Security_Log(ModRightNameDelete, 1, false, User))
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "娌℃湁鍒犻櫎鏉冮檺";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
+
                 if (oDeptHlp.GetInfoByID(HItemID))
                 {
                     if (oDept.HavChildCodes(HItemID))
@@ -293,8 +305,18 @@
                 string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
                 string msg2 = sArray[0].ToString();
                 string msg3 = sArray[1].ToString();
-                string msg4 = sArray[2].ToString();
+                string msg4 = sArray[2].ToString();//鐢ㄦ埛鍚�
                 string msg5 = sArray[3].ToString();
+
+                //鍒ゆ柇鏉冮檺
+                if (!DBUtility.ClsPub.Security_Log(msg5, 1, false, msg4))
+                {
+                    objJsonResult.code = "0";
+                    objJsonResult.count = 0;
+                    objJsonResult.Message = "鏃犱繚瀛樻潈闄�";
+                    objJsonResult.data = null;
+                    return objJsonResult;
+                }
 
                 //鍙嶅簭鍒楀寲
                 msg2 = "[" + msg2.ToString() + "]";
@@ -310,18 +332,6 @@
                 string HRemark = list[0].HRemark;
                 bool HStopflag = list[0].HStopflag;
                 bool HUseFlag = list[0].HUseFlag;
-
-
-                //鍒ゆ柇鏉冮檺
-                //if (!ClsPub.Security_Log(msg5, 1, false, msg4))
-                //{
-                //    objJsonResult.code = "0";
-                //    objJsonResult.count = 0;
-                //    objJsonResult.Message = "娌℃湁鎵惧埌璇ュ姛鑳芥ā鍧楋紒";
-                //    objJsonResult.data = null;
-                //    return objJsonResult;
-                //}
-
 
                 if (!DBUtility.ClsPub.AllowNumber(HNumber))
                 {

--
Gitblit v1.9.1