From 81456046161696d3e1e31a8d9eb428f3b7a3442f Mon Sep 17 00:00:00 2001
From: jhz <jinghz@oceic.com>
Date: 星期四, 22 九月 2022 10:44:56 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/BaseSet/Gy_EmployeeController.cs | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/WebAPI/Controllers/BaseSet/Gy_EmployeeController.cs b/WebAPI/Controllers/BaseSet/Gy_EmployeeController.cs
index 82236eb..501f383 100644
--- a/WebAPI/Controllers/BaseSet/Gy_EmployeeController.cs
+++ b/WebAPI/Controllers/BaseSet/Gy_EmployeeController.cs
@@ -43,19 +43,19 @@
string sql1 = string.Format(@"select * from h_v_IF_EmployeeList where 缁勭粐鍚嶇О='" + Organization + "'");
if (sWhere == null || sWhere.Equals(""))
{
- ds = oCN.RunProcReturn(sql1 + sWhere + "order by HItemID desc", "h_v_IF_EmployeeList");
+ ds = oCN.RunProcReturn(sql1 + sWhere + " order by 鑱屽憳浠ｇ爜", "h_v_IF_EmployeeList");
}
else
{
- string sql = sql1 + sWhere + "order by HItemID desc";
+ string sql = sql1 + sWhere + " order by 鑱屽憳浠ｇ爜";
ds = oCN.RunProcReturn(sql, "h_v_IF_EmployeeList");
}
+
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "Sucess锛�";
objJsonResult.data = ds.Tables[0];
return objJsonResult;
-
}
catch (Exception e)
{
@@ -382,7 +382,6 @@
string HEmpRate = list[0].HEmpRate ?? "";
string HExamRate = list[0].HExamRate ?? "";
DateTime HHealthCardEDate = Convert.ToDateTime("1900/1/1");
-
////鍒ゆ柇鏉冮檺
//if (!ClsPub.Security_Log(msg5, 1, false, msg4))
//{
--
Gitblit v1.9.1