From b5834262308402ea928355987b34d1a9a0011374 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期一, 08 九月 2025 23:43:13 +0800
Subject: [PATCH] bug
---
DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesJSSalary.cs | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesJSSalary.cs b/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesJSSalary.cs
index 472916f..b717d46 100644
--- a/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesJSSalary.cs
+++ b/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesJSSalary.cs
@@ -65,9 +65,12 @@
dynamic dy = _rtn.rtnData;
JObject _job = JObject.Parse(strJson);
JArray array = new JArray();
- foreach (var a in _job["rtnData"]["list"])
+ if (_job["rtnData"]?["list"] != null)
{
- array.Add(a);
+ foreach (var a in _job["rtnData"]["list"])
+ {
+ array.Add(a);
+ }
}
DataTable dt = JsonConvert.DeserializeObject<DataTable>(array.ToString());
@@ -165,7 +168,7 @@
private void ToolBarMenu1_btnDelClick1(object sender, EventArgs e)
{
string rowGuid = "", rowName = "";
- (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_Guid, gridView1, "guid");
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_Guid, gridView1, "hourlyType");
if (string.IsNullOrEmpty(rowGuid))
{
ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
@@ -431,7 +434,7 @@
;
toolBarMenu1.guidKey = "";
string rowGuid, rowName;
- (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_SalaryType, gridView1, "guid");
+ (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_SalaryType, gridView1, "hourlyType");
if (string.IsNullOrEmpty(rowGuid))
{
MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
--
Gitblit v1.9.3