加入term参数，以兼容之前的旧版本。以后版本将会删除

hsweb-web-bean/src/main/java/org/hsweb/web/bean/common/SqlParam.java

@@ -11,6 +11,9 @@ import java.util.*;
  */
 public class SqlParam<R extends SqlParam> {
 
+    @Deprecated
+    protected Map<String, Object> term = new HashMap<>();
+
     /**
      * 条件
      */
@@ -44,15 +47,35 @@ public class SqlParam<R extends SqlParam> {
         return (R) this;
     }
 
+    public Term nest() {
+        return nest(null, null);
+    }
+
+    public Term orNest() {
+        return orNest(null, null);
+    }
+
     public Term nest(String termString, Object value) {
         Term term = new Term();
         term.setField(termString);
         term.setValue(value);
         term.setType(Term.Type.and);
+        term.setNest(true);
         terms.add(term);
         return term;
     }
 
+    public Term orNest(String termString, Object value) {
+        Term term = new Term();
+        term.setField(termString);
+        term.setValue(value);
+        term.setType(Term.Type.or);
+        term.setNest(true);
+        terms.add(term);
+        return term;
+    }
+
+
     public R includes(String... fields) {
         includes.addAll(Arrays.asList(fields));
         return (R) this;
@@ -98,6 +121,22 @@ public class SqlParam<R extends SqlParam> {
         this.terms = terms;
     }
 
+    @Deprecated
+    public Map<String, Object> getTerm() {
+        if (term.isEmpty() && !terms.isEmpty()) {
+            terms.forEach(term1 -> {
+                if (!StringUtils.isNullOrEmpty(term1.getField()))
+                    term.put(term1.getField(), term1.getValue());
+            });
+        }
+        return term;
+    }
+
+    @Deprecated
+    public void setTerm(Map<String, Object> term) {
+        this.term = term;
+    }
+
     @Override
     public String toString() {
         return JSON.toJSONString(this);