From 5d9636ba5741f6ff79c9401bce2626469c35323d Mon Sep 17 00:00:00 2001
From: ch <37327@LLOOCCY>
Date: 星期四, 10 三月 2022 15:07:14 +0800
Subject: [PATCH] 合并
---
WebAPI/Controllers/工资管理/Pay_GroupBalBillController.cs | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git "a/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Pay_GroupBalBillController.cs" "b/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Pay_GroupBalBillController.cs"
index 56a805b..3a64eb2 100644
--- "a/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Pay_GroupBalBillController.cs"
+++ "b/WebAPI/Controllers/\345\267\245\350\265\204\347\256\241\347\220\206/Pay_GroupBalBillController.cs"
@@ -23,7 +23,7 @@
/// <summary>
- /// 杩斿洖宸ヨ祫缁撶畻涓汉鍒楄〃
+ /// 杩斿洖宸ヨ祫缁撶畻涓汉鍒楄〃(闆嗕綋)
///鍙傛暟锛歴tring sql銆�
///杩斿洖鍊硷細object銆�
/// </summary>
@@ -43,6 +43,7 @@
}
ds = Sc_GetGroupBalBill(sWhere);
+
objJsonResult.code = "1";
objJsonResult.count = 1;
objJsonResult.Message = "杩斿洖璁板綍鎴愬姛锛�";
@@ -63,12 +64,12 @@
{
if (sWhere == null || sWhere.Equals(""))
{
- return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Pay_GroupBalBillList order by 鏃ユ湡 desc", "h_v_Pay_GroupBalBillList");
+ return new SQLHelper.ClsCN().RunProcReturn("select * from h_v_Pay_GroupBalBillList order by hmainid desc", "h_v_Pay_GroupBalBillList");
}
else
{
string sql1 = "select * from h_v_Pay_GroupBalBillList 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_Pay_GroupBalBillList");
}
--
Gitblit v1.9.1