From a6e3980c185652cafba399e9b8fcad570d19da6d Mon Sep 17 00:00:00 2001
From: RuicyWu <1063154311@qq.com>
Date: Fri, 12 Jun 2026 11:36:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=BC=E5=AE=B9=E5=A4=9A=E6=8B=AC=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/seeyon/utils/form/FormTableExecutor.java |  7 ++-----
 .../seeyon/utils/form/FormWhereCondition.java    | 16 ++++++++--------
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/seeyon/utils/form/FormTableExecutor.java b/src/main/java/com/seeyon/utils/form/FormTableExecutor.java
index 28f2286..f4b0145 100644
--- a/src/main/java/com/seeyon/utils/form/FormTableExecutor.java
+++ b/src/main/java/com/seeyon/utils/form/FormTableExecutor.java
@@ -499,9 +499,6 @@ public class FormTableExecutor {
         int count = 0;
 
         for (FormUpdateField f : fields) {
-            if (f.getValue() == null || "".equals(f.getValue()) || "null".equals(f.getValue())) {
-                continue;
-            }
             if (count++ > 0) {
                 sql.append(", ");
             }
@@ -587,7 +584,7 @@ public class FormTableExecutor {
         for (int i = 0; i < conditions.size(); i++) {
             FormWhereCondition c = conditions.get(i);
             // 左括号
-            if (c.isStartWithBracket()) {
+            for (int b = 0; b < c.getStartWithBracket(); b++) {
                 whereCause.append("(");
             }
             String field = c.getFieldName();
@@ -634,7 +631,7 @@ public class FormTableExecutor {
                 }
             }
             // 右括号
-            if (c.isEndWithBracket()) {
+            for (int b = 0; b < c.getEndWithBracket(); b++) {
                 whereCause.append(")");
             }
             // AND / OR
diff --git a/src/main/java/com/seeyon/utils/form/FormWhereCondition.java b/src/main/java/com/seeyon/utils/form/FormWhereCondition.java
index 0f69668..ff422d6 100644
--- a/src/main/java/com/seeyon/utils/form/FormWhereCondition.java
+++ b/src/main/java/com/seeyon/utils/form/FormWhereCondition.java
@@ -10,8 +10,8 @@ public class FormWhereCondition {
     private List<Object> values; //值
     private ClauseFactor clauseFactor = ClauseFactor.EQ; //条件因子 eq lt gt not_null null
     private ClauseFactor concatFactor = ClauseFactor.AND; //拼接因子
-    private boolean startWithBracket = false; //是否以括号开头生成子条件
-    private boolean endWithBracket = false; //是否以括号结尾结束子条件
+    private int startWithBracket = 0; //条件前加几个左括号
+    private int endWithBracket = 0; //条件后加几个右括号
     private String index;
     private String expression; //自定义SQL表达式 如 ROUND(CAST(fieldName AS DECIMAL(10,2)), 2) > ?
     private String fieldExpression; //字段表达式 如 CAST(fieldName AS DECIMAL(10,2))，fieldName会被替换为实际字段名
@@ -55,12 +55,12 @@ public class FormWhereCondition {
         return this;
     }
 
-    public FormWhereCondition startWithBracket(boolean startWithBracket) {
+    public FormWhereCondition startWithBracket(int startWithBracket) {
         this.startWithBracket = startWithBracket;
         return this;
     }
 
-    public FormWhereCondition endWithBracket(boolean endWithBracket) {
+    public FormWhereCondition endWithBracket(int endWithBracket) {
         this.endWithBracket = endWithBracket;
         return this;
     }
@@ -91,11 +91,11 @@ public class FormWhereCondition {
         this.clauseFactor = clauseFactor;
     }
 
-    public boolean isStartWithBracket() {
+    public int getStartWithBracket() {
         return startWithBracket;
     }
 
-    public void setStartWithBracket(boolean startWithBracket) {
+    public void setStartWithBracket(int startWithBracket) {
         this.startWithBracket = startWithBracket;
     }
 
@@ -139,11 +139,11 @@ public class FormWhereCondition {
         this.index = index;
     }
 
-    public boolean isEndWithBracket() {
+    public int getEndWithBracket() {
         return endWithBracket;
     }
 
-    public void setEndWithBracket(boolean endWithBracket) {
+    public void setEndWithBracket(int endWithBracket) {
         this.endWithBracket = endWithBracket;
     }