From 8e9a8958bea2cbb33aee292e17574aa95ccc9e07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cddf=E2=80=9D?= <“ddf668490@163.com”>
Date: Mon, 22 Jul 2024 11:38:34 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=87=E6=BB=A4=E5=87=BD=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public10/ThreeFun/Fun/U_RTFun.pas | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/public10/ThreeFun/Fun/U_RTFun.pas b/public10/ThreeFun/Fun/U_RTFun.pas
index 7b8b615..0a76b36 100644
--- a/public10/ThreeFun/Fun/U_RTFun.pas
+++ b/public10/ThreeFun/Fun/U_RTFun.pas
@@ -1738,6 +1738,14 @@ begin
             Result := Result + 'and ' + Controls[i].Name + '=' + quotedStr(Trim(TComboBox(Controls[i]).Text))
           else if Controls[i].Tag = LikeTag then
             Result := Result + 'and ' + Controls[i].Name + ' like ' + quotedStr('%' + Trim(TComboBox(Controls[i]).Text) + '%');
+      end
+      else if Controls[i] is TcxComboBox then
+      begin
+        if Trim(TcxComboBox(Controls[i]).Text) <> '' then
+          if Controls[i].Tag = EquTag then
+            Result := Result + 'and ' + Controls[i].Name + '=' + quotedStr(Trim(TcxComboBox(Controls[i]).Text))
+          else if Controls[i].Tag = LikeTag then
+            Result := Result + 'and ' + Controls[i].Name + ' like ' + quotedStr('%' + Trim(TcxComboBox(Controls[i]).Text) + '%');
       end;
     end;
   end;
@@ -2545,7 +2553,7 @@ begin
   finally
     mADOTmp.close;
     mADOTmp.Free;
-    cxGrid.EndUpdate() ;
+    cxGrid.EndUpdate();
   end;
 
 end;
@@ -2571,7 +2579,7 @@ begin
   mGridName := cxGrid.GetParentComponent.Name + '.' + cxGrid.name;
 
   try
-     cxGrid.BeginUpdate();
+    cxGrid.BeginUpdate();
     mADOTmp := TADOQuery.Create(nil);
     mADOTmp.ConnectionString := DConString;
     /////////////////////////////////////////
@@ -2654,7 +2662,7 @@ begin
   finally
     mADOTmp.close;
     mADOTmp.Free;
-    cxGrid.EndUpdate ;
+    cxGrid.EndUpdate;
   end;
 
 end;