From c78341d973da968d25a8185f646b624bd9a5e0d0 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期四, 01 九月 2022 15:07:28 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/BaseSet/Gy_DepartmentController.cs | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/WebAPI/Controllers/BaseSet/Gy_DepartmentController.cs b/WebAPI/Controllers/BaseSet/Gy_DepartmentController.cs
index b23a06c..269948f 100644
--- a/WebAPI/Controllers/BaseSet/Gy_DepartmentController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_DepartmentController.cs
@@ -41,11 +41,11 @@
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");
}
@@ -54,7 +54,6 @@
objJsonResult.Message = "Sucess锛�";
objJsonResult.data = ds.Tables[0];
return objJsonResult;
-
}
catch (Exception e)
{
@@ -375,9 +374,10 @@
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))
{
@@ -388,6 +388,8 @@
return objJsonResult;
}
//鍙嶅簭鍒楀寲
+ msg2 = msg2.Replace("\\", "");
+ msg2 = msg2.Replace("\n", "");
msg2 = "[" + msg2.ToString() + "]";
List<Department> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Department>>(msg2);
@@ -407,7 +409,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;
--
Gitblit v1.9.1