From 5cf93142c9ecd06fedc58b9400e2f02d3d7d2455 Mon Sep 17 00:00:00 2001
From: zzr99 <1940172413@qq.com>
Date: 星期一, 11 十月 2021 17:59:38 +0800
Subject: [PATCH] 器具档案和器具分类的查看删除权限
---
WebAPI/Controllers/BaseSet/Gy_ModelTypeController.cs | 67 +++++++++++++++-------
WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user | 34 +++++-----
WebAPI/Controllers/BaseSet/Gy_MaterialController.cs | 66 +++++++++++++++++-----
Pub_Class/CustomerCls/ClsPub.cs | 2
4 files changed, 114 insertions(+), 55 deletions(-)
diff --git a/Pub_Class/CustomerCls/ClsPub.cs b/Pub_Class/CustomerCls/ClsPub.cs
index 5739f2b..093a9b1 100644
--- a/Pub_Class/CustomerCls/ClsPub.cs
+++ b/Pub_Class/CustomerCls/ClsPub.cs
@@ -707,7 +707,7 @@
}
- //鍒ゆ柇鏄兘瀛樺湪鏉冮檺,骞跺啓鍏ユ棩蹇�
+ //鍒ゆ柇鏄惁瀛樺湪鏉冮檺,骞跺啓鍏ユ棩蹇�
public static bool Security_Log(string gnsy, int LogTF, bool Msg,string CurUserName)
{
//gnsy 鍔熻兘绱㈠紩,妯″潡
diff --git a/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs b/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
index 7597ede..3bfffd6 100644
--- a/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
@@ -359,10 +359,18 @@
/// </summary>
[Route("Gy_Mould/list1")]
[HttpGet]
- public object list1(string sWhere)
+ public object list1(string sWhere,string ModRightNameSelect, string user)
{
try
{
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameSelect, 1, true, 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_Gy_MouldFileList " + sWhere, "h_v_Gy_MouldFileList");
@@ -508,14 +516,27 @@
///杩斿洖鍊硷細object銆�
/// </summary>
[Route("Gy_Mould_Edit/AddBill")]
- [HttpPost]
- public object AddBill([FromBody] JObject sMainSub)
+ [HttpGet]
+ public object AddBill([FromBody] JObject oMain)
{
- var _value = sMainSub["oMain"].ToString();
+ 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();//妯″潡鏉冮檺
+
oCN.BeginTran();
+ if (!DBUtility.ClsPub.Security_Log(msg4, 1, true, msg3))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁鏌ョ湅鏉冮檺";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
//淇濆瓨涓昏〃
- objJsonResult = AddBillMain(msg1);
+ objJsonResult = AddBillMain(msg2);
if (objJsonResult.code == "0")
{
oCN.RollBack();
@@ -532,10 +553,8 @@
return objJsonResult;
}
- public json AddBillMain(string msg1)
+ public json AddBillMain(string msg2)
{
- string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
- string msg2 = sArray[0].ToString();
try
{
msg2 = "[" + msg2.ToString() + "]";
@@ -650,16 +669,25 @@
[HttpPost]
public object AddBill1([FromBody] JObject oMain)
{
-
+ 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();//妯″潡鏉冮檺
try
{
+ if (!DBUtility.ClsPub.Security_Log(msg4, 1, true, msg3))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁鏌ョ湅鏉冮檺";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
DAL.ClsGy_MouldFile oMould = new DAL.ClsGy_MouldFile();
DAL.ClsGy_MouldFileMain_View oDeptHlp = new DAL.ClsGy_MouldFileMain_View();
- var _value = oMain["oMain"].ToString();
- string msg1 = _value.ToString();
- string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
- string msg2 = sArray[0].ToString();
//鍙嶅簭鍒楀寲
msg2 = "[" + msg2.ToString() + "]";
@@ -814,12 +842,20 @@
/// </summary>
[Route("Gy_Mould_Edit/Delete_Json")]
[HttpGet]
- public object Delete_Json(long hmainid)
+ public object Delete_Json(long hmainid, string ModRightNameDelete, string user)
{
DAL.ClsGy_MouldFile oBill = new DAL.ClsGy_MouldFile();
try
{
- if (oBill.DeleteBill(hmainid, ref DBUtility.ClsPub.sExeReturnInfo))
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameDelete, 1, true, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁鍒犻櫎鏉冮檺";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
+ if (oBill.DeleteBill(hmainid, ref DBUtility.ClsPub.sExeReturnInfo))
{
//鍐欏叆鏃ュ織
ClsPub.Add_Log("", "鍒犻櫎椤圭洰锛屼唬鐮侊細" + oBill.omodel.HMouldNo + ",鍚嶇О锛�" + oBill.omodel.HName, ClsPub.CurUserName);
diff --git a/WebAPI/Controllers/BaseSet/Gy_ModelTypeController.cs b/WebAPI/Controllers/BaseSet/Gy_ModelTypeController.cs
index dbb4ac5..1110345 100644
--- a/WebAPI/Controllers/BaseSet/Gy_ModelTypeController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_ModelTypeController.cs
@@ -30,10 +30,18 @@
/// </summary>
[Route("Gy_ModelType/list")]
[HttpGet]
- public object list(string sWhere)
+ public object list(string sWhere, string ModRightNameSelect, string user)
{
try
{
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameSelect, 1, true, user))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁鏌ョ湅鏉冮檺";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
ds = oCN.RunProcReturn("select HItemID,HParentID,HNumber,HName,HLevel, case when HEndFlag<>0 then 'Y'else ' 'end HEndFlag,case when HStopFlag <> 0 then 'Y'else ' 'end HStopFlag, HRemark, HUseFlag from Gy_MouldType where 1=1 " + sWhere, "Gy_MouldType");
if (ds == null || ds.Tables[0].Rows.Count == 0)
{
@@ -120,14 +128,14 @@
try
{
- //if (!DBUtility.ClsPub.Security_Log(ModRightNameDelete, 1, true, User))
- //{
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "娌℃湁鍒犻櫎鏉冮檺";
- // objJsonResult.data = null;
- // return objJsonResult;
- //}
+ if (!DBUtility.ClsPub.Security_Log(ModRightNameDelete, 1, true, User))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁鍒犻櫎鏉冮檺";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
if (oDeptHlp.GetInfoByID(HItemID))
{
if (oDept.HavChildCodes(HItemID))
@@ -201,10 +209,15 @@
{
var _value = oMain["oMain"].ToString();
string msg1 = _value.ToString();
- //鍙嶅簭鍒楀寲
- msg1 = "[" + msg1.ToString() + "]";
+ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
+ string msg2 = sArray[0].ToString();
+ string msg3 = sArray[1].ToString();//褰撳墠浜�
+ string msg4 = sArray[2].ToString();//妯″潡鏉冮檺
- List<Model.ClsGy_MouldType_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_MouldType_Model>>(msg1);
+ //鍙嶅簭鍒楀寲
+ msg2 = "[" + msg2.ToString() + "]";
+
+ List<Model.ClsGy_MouldType_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_MouldType_Model>>(msg2);
string HNumber = list[0].HNumber;
string HName = list[0].HName;
@@ -216,6 +229,16 @@
bool HStopflag = list[0].HStopflag;
string HUseFlag = list[0].HUseFlag;
bool HEndFlag = list[0].HEndFlag;
+
+ //鍒ゆ柇鏉冮檺
+ if (!ClsPub.Security_Log(msg4, 1, true, msg3))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁鎵惧埌璇ュ姛鑳芥ā鍧楋紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
if (!DBUtility.ClsPub.AllowNumber(HNumber))
{
@@ -275,8 +298,8 @@
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();
+ string msg4 = sArray[2].ToString();//褰撳墠浜�
+ string msg5 = sArray[3].ToString();//鏉冮檺妯″潡
//鍙嶅簭鍒楀寲
msg2 = "[" + msg2.ToString() + "]";
@@ -293,14 +316,14 @@
string HUseFlag = list[0].HUseFlag;
//鍒ゆ柇鏉冮檺
- //if (!ClsPub.Security_Log(msg5, 1, true, msg4))
- //{
- // objJsonResult.code = "0";
- // objJsonResult.count = 0;
- // objJsonResult.Message = "娌℃湁鎵惧埌璇ュ姛鑳芥ā鍧楋紒";
- // objJsonResult.data = null;
- // return objJsonResult;
- //}
+ if (!ClsPub.Security_Log(msg5, 1, true, msg4))
+ {
+ objJsonResult.code = "0";
+ objJsonResult.count = 0;
+ objJsonResult.Message = "娌℃湁鎵惧埌璇ュ姛鑳芥ā鍧楋紒";
+ objJsonResult.data = null;
+ return objJsonResult;
+ }
if (!DBUtility.ClsPub.AllowNumber(HNumber))
diff --git a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
index 56111aa..e6b772e 100644
--- a/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -18,25 +18,25 @@
<publishTime>02/22/2013 08:43:40</publishTime>
</File>
<File Include="bin/BLL.dll">
- <publishTime>10/08/2021 17:41:41</publishTime>
+ <publishTime>10/11/2021 17:40:10</publishTime>
</File>
<File Include="bin/BLL.pdb">
- <publishTime>10/08/2021 17:41:41</publishTime>
+ <publishTime>10/11/2021 17:40:10</publishTime>
</File>
<File Include="bin/DAL.dll">
- <publishTime>10/08/2021 17:41:37</publishTime>
+ <publishTime>10/11/2021 17:40:08</publishTime>
</File>
<File Include="bin/DAL.pdb">
- <publishTime>10/08/2021 17:41:37</publishTime>
+ <publishTime>10/11/2021 17:40:08</publishTime>
</File>
<File Include="bin/Dapper.dll">
<publishTime>07/22/2016 14:52:40</publishTime>
</File>
<File Include="bin/DBUtility.dll">
- <publishTime>10/08/2021 17:41:31</publishTime>
+ <publishTime>10/11/2021 17:40:05</publishTime>
</File>
<File Include="bin/DBUtility.pdb">
- <publishTime>10/08/2021 17:41:31</publishTime>
+ <publishTime>10/11/2021 17:40:05</publishTime>
</File>
<File Include="bin/Interop.gregn6Lib.dll">
<publishTime>08/25/2021 10:28:25</publishTime>
@@ -60,10 +60,10 @@
<publishTime>07/25/2012 11:48:56</publishTime>
</File>
<File Include="bin/Model.dll">
- <publishTime>10/08/2021 17:41:32</publishTime>
+ <publishTime>10/11/2021 17:40:05</publishTime>
</File>
<File Include="bin/Model.pdb">
- <publishTime>10/08/2021 17:41:32</publishTime>
+ <publishTime>10/11/2021 17:40:05</publishTime>
</File>
<File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs">
<publishTime>08/16/2021 17:23:15</publishTime>
@@ -72,22 +72,22 @@
<publishTime>08/03/2014 20:33:56</publishTime>
</File>
<File Include="bin/Pub_Class.dll">
- <publishTime>10/08/2021 17:41:27</publishTime>
+ <publishTime>10/11/2021 17:40:03</publishTime>
</File>
<File Include="bin/Pub_Class.pdb">
- <publishTime>10/08/2021 17:41:27</publishTime>
+ <publishTime>10/11/2021 17:40:03</publishTime>
</File>
<File Include="bin/Pub_Control.dll">
- <publishTime>10/08/2021 17:41:29</publishTime>
+ <publishTime>10/11/2021 17:40:04</publishTime>
</File>
<File Include="bin/Pub_Control.pdb">
- <publishTime>10/08/2021 17:41:29</publishTime>
+ <publishTime>10/11/2021 17:40:04</publishTime>
</File>
<File Include="bin/SQLHelper.dll">
- <publishTime>10/08/2021 17:41:29</publishTime>
+ <publishTime>10/11/2021 17:40:04</publishTime>
</File>
<File Include="bin/SQLHelper.pdb">
- <publishTime>10/08/2021 17:41:29</publishTime>
+ <publishTime>10/11/2021 17:40:04</publishTime>
</File>
<File Include="bin/stdole.dll">
<publishTime>05/09/2021 13:35:37</publishTime>
@@ -189,10 +189,10 @@
<publishTime>11/24/2014 11:18:48</publishTime>
</File>
<File Include="bin/WebAPI.dll">
- <publishTime>10/08/2021 17:41:47</publishTime>
+ <publishTime>10/11/2021 17:40:14</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
- <publishTime>10/08/2021 17:41:47</publishTime>
+ <publishTime>10/11/2021 17:40:14</publishTime>
</File>
<File Include="bin/WebGrease.dll">
<publishTime>07/17/2013 17:03:52</publishTime>
@@ -363,7 +363,7 @@
<publishTime>08/06/2021 22:57:28</publishTime>
</File>
<File Include="Web.config">
- <publishTime>10/08/2021 17:41:59</publishTime>
+ <publishTime>10/11/2021 17:48:20</publishTime>
</File>
</ItemGroup>
</Project>
\ No newline at end of file
--
Gitblit v1.9.1