From 76ffaf6c0b670ca779523ff22fbfb536bb45bf71 Mon Sep 17 00:00:00 2001
From: 杨乐 <yang.le.192@qq.com>
Date: 星期三, 19 一月 2022 08:49:55 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/BaseSet/Gy_MaintenanceModeController.cs | 35 +++++++++++++++++++++--------------
1 files changed, 21 insertions(+), 14 deletions(-)
diff --git a/WebAPI/Controllers/BaseSet/Gy_MaintenanceModeController.cs b/WebAPI/Controllers/BaseSet/Gy_MaintenanceModeController.cs
index b0bfb6c..db3f653 100644
--- a/WebAPI/Controllers/BaseSet/Gy_MaintenanceModeController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_MaintenanceModeController.cs
@@ -20,6 +20,9 @@
DataSet ds;
+ #region 缁翠慨鏂瑰紡
+
+ #region 缁翠慨鏂瑰紡鍔犺浇鍒楄〃
/// <summary>
/// 杩斿洖缁翠慨鏂瑰紡鍒楄〃
///鍙傛暟锛歴tring sql銆�
@@ -67,8 +70,9 @@
return objJsonResult;
}
}
+ #endregion
-
+ #region 缁翠慨鏂瑰紡鏍规嵁鏍戝瀷id鏌ヨ鍒楄〃
/// <summary>
/// 鏍规嵁鍩虹璧勬枡ID 鏌ユ壘璁板綍
///鍙傛暟锛歴tring sql銆�
@@ -81,7 +85,7 @@
try
{
- ds = oCN.RunProcReturn("select * from h_v_IF_RepairTypeList where HitemID=" + HInterID, "h_v_IF_RepairTypeList");
+ ds = oCN.RunProcReturn(string.Format(@"WITH a AS (SELECT * FROM dbo.h_v_IF_RepairTypeList WHERE HitemID="+ HInterID + " UNION ALL SELECT s.* FROM dbo.h_v_IF_RepairTypeList AS s,a WHERE s.parentid=a.HitemID) SELECT * FROM a"), "h_v_IF_RepairTypeList");
if (ds == null || ds.Tables[0].Rows.Count == 0)
{
objJsonResult.code = "0";
@@ -108,7 +112,9 @@
return objJsonResult;
}
}
+ #endregion
+ #region 缁翠慨鏂瑰紡鍒犻櫎
/// <summary>
/// 缁翠慨鏂瑰紡鍒楄〃鍒犻櫎鎸夐挳
///鍙傛暟锛歴tring sql銆�
@@ -122,7 +128,7 @@
DAL.ClsGy_RepairType_View oDeptHlp = new DAL.ClsGy_RepairType_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;
@@ -187,16 +193,9 @@
return objJsonResult;
}
}
+ #endregion
- //[Route("Gy_Department/LoadTree")]
- //[HttpGet]
- //public object LoadTree_Json()
- //{
- // DBUtility.Gy_BaseFun.LoadTree(tv, imageList1, this.Text, BillName);
- //}
-
-
-
+ #region 缁翠慨鏂瑰紡鏂板淇濆瓨
/// <summary>
/// 鏂板鍗曟嵁-淇濆瓨鎸夐挳
///鍙傛暟锛歴tring sql銆�
@@ -272,8 +271,9 @@
return objJsonResult;
}
}
+ #endregion
-
+ #region 缁翠慨鏂瑰紡淇敼淇濆瓨
/// <summary>
/// 淇敼鍗曟嵁-淇濆瓨鎸夐挳
///鍙傛暟锛歴tring sql銆�
@@ -312,7 +312,7 @@
//鍒ゆ柇鏉冮檺
- if (!ClsPub.Security_Log(msg5, 1, true, msg4))
+ if (!ClsPub.Security_Log(msg5, 1, false, msg4))
{
objJsonResult.code = "0";
objJsonResult.count = 0;
@@ -373,6 +373,7 @@
return objJsonResult;
}
}
+ #endregion
/// <summary>
@@ -405,6 +406,8 @@
}
+ #region 缁翠慨鏂瑰紡淇敼鑾峰彇閫変腑鏁版嵁
+
/// <summary>
/// 缁翠慨鍒楄〃淇敼鎸夐挳鏂规硶
///鍙傛暟锛歴tring sql銆�
@@ -433,8 +436,10 @@
return objJsonResult;
}
}
+ #endregion
+ #region 缁翠慨鏂瑰紡鑾峰彇鏍戝瀷鏁版嵁
[Route("Gy_MaintenanceMode/LoadTree")]
[HttpGet]
@@ -461,7 +466,9 @@
return objJsonResult;
}
}
+ #endregion
+ #endregion
//
--
Gitblit v1.9.1