From 8dfc8d054b5b14e3fcde6415dd22cedf10c09915 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期二, 05 十一月 2024 14:13:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 DevApp/Gs.DevApp/UserControl/SelectCgMx.cs |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/DevApp/Gs.DevApp/UserControl/SelectCgMx.cs b/DevApp/Gs.DevApp/UserControl/SelectCgMx.cs
index ce7be0b..677d751 100644
--- a/DevApp/Gs.DevApp/UserControl/SelectCgMx.cs
+++ b/DevApp/Gs.DevApp/UserControl/SelectCgMx.cs
@@ -75,11 +75,11 @@
         private void getPageList(int curPage, int pageSize)
         {
             var _sbSqlWhere = new StringBuilder();
-            _sbSqlWhere.Append(" ");
+            _sbSqlWhere.Append(strWhere);
             foreach (var itm in _filterList)
                 _sbSqlWhere.Append(" and " + itm.fileId + itm.fileOper + "'" +
                                    itm.fileValue + "'");
-            var pgq = new PageQueryModel(curPage, pageSize, "BILL_NO", "asc",
+            var pgq = new PageQueryModel(curPage, pageSize, "B.BILL_NO", "asc",
                 "", _sbSqlWhere.ToString());
             var json = JsonConvert.SerializeObject(pgq);
             try

--
Gitblit v1.9.3