From 7b31d00b64218b6f11e2fa92386e3d15ee332d3e Mon Sep 17 00:00:00 2001
From: yxj <1qaz@123>
Date: 星期一, 16 五月 2022 15:51:49 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/工资管理/Gy_GroupEmpBillController.cs | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git "a/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Gy_GroupEmpBillController.cs" "b/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Gy_GroupEmpBillController.cs"
index 37dcfff..a4e787c 100644
--- "a/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Gy_GroupEmpBillController.cs"
+++ "b/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Gy_GroupEmpBillController.cs"
@@ -40,7 +40,9 @@
objJsonResult.data = null;
return objJsonResult;
}
+
ds = Sc_GetGroupEmpBill(sWhere);
+
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�";
@@ -61,12 +63,12 @@
{
if (sWhere == null || sWhere.Equals(""))
{
- return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Gy_GroupEmpBillList order by 鏃ユ湡 desc", "h_v_Gy_GroupEmpBillList");
+ return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Gy_GroupEmpBillList order by hmainid desc", "h_v_Gy_GroupEmpBillList");
}
else
{
string sql1 = "select * from h_v_Gy_GroupEmpBillList where 1 = 1 ";
- string sql = sql1 + sWhere + "order by 鏃ユ湡 desc";
+ string sql = sql1 + sWhere + " order by hmainid desc";
return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Gy_GroupEmpBillList");
}
@@ -138,7 +140,7 @@
string refSav = sArray[2].ToString();
string msg4 = sArray[3].ToString();
- string UserName = "";
+ string UserName = msg4;
string s = "";
long mouldid;
ListModels oListModels = new ListModels();
--
Gitblit v1.9.1