~yxj/MES-WEB-API.git

			@@ -1,4 +1,5 @@
			using Newtonsoft.Json.Linq;
			using Newtonsoft.Json;
			using Newtonsoft.Json.Linq;
			using Pub_Class;
			using System;
			using System.Collections;
			@@ -25,27 +26,45 @@
			/// </summary>
			[Route("Gy_Department/list")]
			[HttpGet]
			public object list(string sWhere,string Organization)
			public object list(string sWhere,string user,string Organization)
			{
			try
			{
			List<object> columnNameList = new List<object>();
			//查看权限
			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 部门代码", "h_v_IF_DepartmentList");
			}
			else
			{
			string sql = sql1 + sWhere + "order by HItemID desc";
			string sql = sql1 + sWhere + "order by 部门代码 ";
			ds = oCN.RunProcReturn(sql, "h_v_IF_DepartmentList");
			}

			//添加列名
			foreach (DataColumn col in ds.Tables[0].Columns)
			{
			Type dataType = col.DataType;
			string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
			columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
			}

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "Sucess！";
			objJsonResult.data = ds.Tables[0];
			objJsonResult.list = columnNameList;
			return objJsonResult;

			}
			catch (Exception e)
			{
			@@ -103,21 +122,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, false, 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))
			@@ -366,9 +385,22 @@
			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_second("Gy_Department_Edit", 1, false, msg3))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无保存权限！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			//反序列化
			msg2 = msg2.Replace("\\", "");
			msg2 = msg2.Replace("\n", "");
			msg2 = "[" + msg2.ToString() + "]";
			List<Department> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Department>>(msg2);

			@@ -388,7 +420,7 @@
			//string HCreator = list[0].HCreator;
			long HCreateOrgID = list[0].HCreateOrgID;
			//DateTime HCreateDate = list[0].HCreateDate;
			long HUseOrgID = list[0].HUseOrgID;
			long HUseOrgID = long.Parse(msg4);
			string HUpdater = list[0].HUpDater;
			//DateTime HUpdateDate = list[0].HUpDateDate;
			string HChecker = list[0].HChecker;