MES-WEB-API.git

			@@ -25,36 +25,35 @@
			/// </summary>
			[Route("Gy_Department/list")]
			[HttpGet]
			public object list(string sWhere)
			public object list(string sWhere,string user,string Organization)
			{
			try
			{
			if (sWhere == null \|\| sWhere.Equals(""))
			{
			ds = oCN.RunProcReturn("select * from h_v_IF_DepartmentList " + sWhere, "h_v_IF_DepartmentList");
			}
			else
			{
			string sql1 = "select * from h_v_IF_DepartmentList where 1 = 1 ";
			string sql = sql1 + sWhere;
			ds = oCN.RunProcReturn(sql, "h_v_IF_DepartmentList");
			}
			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			//查看权限
			if (!DBUtility.ClsPub.Security_Log("Gy_Department", 1, false, user))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "false！";
			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 部门代码", "h_v_IF_DepartmentList");
			}
			else
			{
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "Sucess！";
			objJsonResult.data = ds.Tables[0];
			return objJsonResult;
			string sql = sql1 + sWhere + "order by 部门代码 ";
			ds = oCN.RunProcReturn(sql, "h_v_IF_DepartmentList");
			}

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "Sucess！";
			objJsonResult.data = ds.Tables[0];
			return objJsonResult;
			}
			catch (Exception e)
			{
			@@ -112,21 +111,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))
			@@ -271,7 +270,8 @@
			[HttpPost]
			public object AddBill([FromBody] JObject oMain)
			{
			try {
			try
			{
			var _value = oMain["oMain"].ToString();
			string msg1 = _value.ToString();
			//反序列化
			@@ -280,7 +280,7 @@
			DAL.ClsGy_Department_Ctl oDept = new DAL.ClsGy_Department_Ctl();
			DAL.ClsGy_Department_View oDeptHlp = new DAL.ClsGy_Department_View();




			List<Department> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Department>>(msg1);

			@@ -342,7 +342,7 @@
			//objJsonResult.data = null;
			return objJsonResult;
			}
			catch(Exception e)
			catch (Exception e)
			{
			oCN.RollBack();
			objJsonResult.code = "0";
			@@ -373,9 +373,19 @@
			string msg1 = _value.ToString();
			string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
			string msg2 = sArray[0].ToString();
			//string msg3 = sArray[1].ToString();
			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);
			@@ -408,7 +418,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;
			@@ -447,7 +457,7 @@
			",HLevel,HEndFlag,HStopflag,HRemark,HEmpID,HBarCodeForBase,HEntityID,HUSEORGID) " +
			" Values('" + HNumber + "','" + HName + "','" + HHelpCode + "','" + HShortNumber + "'," + HParentID.ToString() +
			"," + HLevel.ToString() + "," + Convert.ToString(HEndFlag ? 1 : 0) + "," + Convert.ToString(HStopflag ? 1 : 0) + ",'" + HRemark + "'," + HEmpID + ",'" + HBarCode + "'" +
			"," + HEntityID.ToString() +","+ HUseOrgID + ")", ref DBUtility.ClsPub.sExeReturnInfo);
			"," + HEntityID.ToString() + "," + HUseOrgID + ")", ref DBUtility.ClsPub.sExeReturnInfo);
			//修改上级为非末级代码
			oCN.RunProc("Update Gy_Department set HEndflag=0 where HItemID=" + HParentID, ref DBUtility.ClsPub.sExeReturnInfo);
			oCN.Commit();