From 9d72a9a60277480cdcb22aad38db30a5bed7a3a6 Mon Sep 17 00:00:00 2001
From: shuliYao <1397940314@qq.com>
Date: Tue, 2 Apr 2024 10:15:09 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=A1=86=E6=9E=B6=E5=AE=9A=E5=88=B6?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=B0=81=E8=A3=85bug=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=EF=BC=8CsearchQuery?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/util/requestFormat/SearchQuery.java  | 23 +++++++++++++++----
 .../util/requestFormat/SearchQueryForm.java   |  8 +++----
 2 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/jyjz-common/jyjz-common-base/src/main/java/cn/jyjz/xiaoyao/common/base/util/requestFormat/SearchQuery.java b/jyjz-common/jyjz-common-base/src/main/java/cn/jyjz/xiaoyao/common/base/util/requestFormat/SearchQuery.java
index 6d7fb60b..1eef9ec5 100644
--- a/jyjz-common/jyjz-common-base/src/main/java/cn/jyjz/xiaoyao/common/base/util/requestFormat/SearchQuery.java
+++ b/jyjz-common/jyjz-common-base/src/main/java/cn/jyjz/xiaoyao/common/base/util/requestFormat/SearchQuery.java
@@ -154,6 +154,17 @@ public class SearchQuery implements java.io.Serializable{
     public void addLessEqual(String field,Date value){
         addQuery(field,value, SearchQueryConstant.SEARCH_LESS_EQUAL);
     }
+
+    public void addRulesOp(String field,String rulesOp){
+        SearchQueryForm searchQueryForm = new SearchQueryForm();
+        if(query.get(field)!=null){
+            searchQueryForm = (SearchQueryForm) query.get(field);
+            searchQueryForm.setRulesOp(rulesOp);
+            return;
+        }
+        searchQueryForm.setRulesOp(rulesOp);
+        query.put(field,searchQueryForm);
+    }
     /**
      *
      * @param field 字段名称
@@ -177,11 +188,15 @@ public class SearchQuery implements java.io.Serializable{
             log.error("【添加搜索条件】对象-value-错误，value不能为空");
             return;
         }
-        if(null != query.get(field)){
-            log.error("【添加搜索条件】-query-错误，query已经存在数据,field={}",field);
-            return;
-        }
+//        if(null != query.get(field)){
+//            log.error("【添加搜索条件】-query-错误，query已经存在数据,field={}",field);
+//            return;
+//        }
         SearchQueryForm lf = new SearchQueryForm();
+        if(query.get(field)!=null){
+            lf = (SearchQueryForm) query.get(field);
+        }
+
         lf.setField(field);
         lf.setDataOp(SearchQueryUtil.filterMap.get(filter));
         lf.setOp(filter);
diff --git a/jyjz-common/jyjz-common-base/src/main/java/cn/jyjz/xiaoyao/common/base/util/requestFormat/SearchQueryForm.java b/jyjz-common/jyjz-common-base/src/main/java/cn/jyjz/xiaoyao/common/base/util/requestFormat/SearchQueryForm.java
index 77849648..f42daa7c 100644
--- a/jyjz-common/jyjz-common-base/src/main/java/cn/jyjz/xiaoyao/common/base/util/requestFormat/SearchQueryForm.java
+++ b/jyjz-common/jyjz-common-base/src/main/java/cn/jyjz/xiaoyao/common/base/util/requestFormat/SearchQueryForm.java
@@ -8,10 +8,10 @@ import java.io.Serializable;
  */
 public class SearchQueryForm implements Serializable {
     private static final long serialVersionUID = 1L;
-    private String field;// 字段名称
-    private String op;// 比对条件
-    private Object value;// 比对内容
-    private String type;// 类型
+    private String field;// 字段名称 username and  t1.username = %111%(vachar)
+    private String op;// 比对条件  =
+    private Object value;// 比对内容 111
+    private String type;// 类型 ()
     private String rulesOp;// 搜索条件的关联方式，或/与（and/or）
     private String tablenameother = "";// 数据表别名
     private String dataOp;// 数据库中的比较条件,根据op属性获取