From c7bf48f709dbddd7744c2d005686606bc168a88a Mon Sep 17 00:00:00 2001
From: cdk <2441919651@qq.com>
Date: 星期六, 25 十月 2025 09:13:57 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/UserControl/UcLookDepartment.cs | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/DevApp/Gs.DevApp/UserControl/UcLookDepartment.cs b/DevApp/Gs.DevApp/UserControl/UcLookDepartment.cs
index 557c3d7..7fc75c9 100644
--- a/DevApp/Gs.DevApp/UserControl/UcLookDepartment.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcLookDepartment.cs
@@ -30,15 +30,18 @@
if (EditChanged != null) EditChanged(this, e);
}
- public void getSuppler(string orgId, string _dftVale = "")
+ public void getSuppler(string orgId, string _dftVale = "", string strWhere = "")
{
lookSearchSupplier.EditValue = null;
System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder();
if (!string.IsNullOrEmpty(orgId))
_sbSqlWhere.Append(" and a.FSubsidiary ='" + orgId + "'");
- _sbSqlWhere.Append(" and a.FSubsidiary in");
+ _sbSqlWhere.Append(" and a.FSubsidiary in");
_sbSqlWhere.Append(ToolBox.UtilityHelper.GetOrgWhere());
-
+ if (!string.IsNullOrEmpty(strWhere))
+ {
+ _sbSqlWhere.Append(" and " + strWhere);
+ }
var pgq = new PageQueryModel(1, 999999, "a.FSubsidiary asc,a.departmentcode", "asc", "", " and 1=1" + _sbSqlWhere.ToString());
var json = JsonConvert.SerializeObject(pgq);
try
--
Gitblit v1.9.3