From 6940ba1b4fe555c94353de9d7ab6a53a6c8884bc Mon Sep 17 00:00:00 2001
From: wbc <2597324127@qq.com>
Date: 星期三, 03 十二月 2025 18:27:35 +0800
Subject: [PATCH] Merge branch 'master' of http://43.142.96.171:8080/r/~kyy/LB_MesClient

---
 DevApp/Gs.DevApp/UserControl/UcLookDepartment.cs |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/DevApp/Gs.DevApp/UserControl/UcLookDepartment.cs b/DevApp/Gs.DevApp/UserControl/UcLookDepartment.cs
index 557c3d7..afa06cf 100644
--- a/DevApp/Gs.DevApp/UserControl/UcLookDepartment.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcLookDepartment.cs
@@ -30,15 +30,19 @@
             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);
+            }
+            _sbSqlWhere.Append(" and a.Depextr4 = 'A'");
             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