From aaea9659e60f676bebc47b153aa227ebd730265c Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期一, 08 九月 2025 10:49:22 +0800
Subject: [PATCH] bug

---
 DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesJJSalary.cs |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesJJSalary.cs b/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesJJSalary.cs
index 91327b1..1911b51 100644
--- a/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesJJSalary.cs
+++ b/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_MesJJSalary.cs
@@ -196,7 +196,7 @@
             lbGuid.Text = "";
             Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 4);
             UtilityHelper.CleanValueByControl(this.layoutMx1.Controls, true);
-
+            this.txt_itemId.ReadOnly = true;
         }
         private void ToolBarMenu1_btnEdtClick(object sender, EventArgs e)
         {
@@ -211,7 +211,7 @@
             Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
 
                 getModel(rowGuid);
-
+            txt_itemId.Enabled = false;
         }
 
         /// <summary>
@@ -291,7 +291,11 @@
         /// <param name="pageSize">姣忛〉鍑犳潯</param>
         private void getPageList(int curPage)
         {
-            gcMain1.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
+            gcMain1.DataSource = null; 
+            System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder();
+            _sbSqlWhere.Append(" and b.FSubsidiary in");
+            _sbSqlWhere.Append(ToolBox.UtilityHelper.GetOrgWhere());
+            _sbSqlWhere.Append(UtilityHelper.GetSearchWhere(_filterList));
             var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "", "", "", _sbSqlWhere.ToString());
             var json = JsonConvert.SerializeObject(pgq);
             try

--
Gitblit v1.9.3