query调整and封装条件 更新 %DE%SearchContext.java.ftl

SLN/%PUBPRJ%-core/src/main/java/%SYS_PKGPATH%/core/%MOD_PKGPATH%/filter/%DE%SearchContext.java.ftl

@@ -109,11 +109,24 @@ public class ${item.codeName}SearchContext extends QueryWrapperContext<${item.co
 	{
 		 this.query=query;
 		 if(!StringUtils.isEmpty(query)){
+	<#assign bFisrtLoop = true >
+	<#assign bHasSearch = false >
     <#list item.getPSDEFields() as defield>
-        <#if defield.isEnableQuickSearch()==true>
-			this.getSelectCond().or().like("${defield.name?lower_case}",query);
+        <#if defield.isEnableQuickSearch()==true >
+            <#assign bHasSearch = true >
+            <#if bFisrtLoop>
+            this.getSelectCond().and(wrapper ->
+                     wrapper.like("${defield.name?lower_case}", query)   
+            <#assign bFisrtLoop = false >         
+            <#else>
+                     .or().like("${defield.name?lower_case}", query)            
+            </#if>
         </#if>
     </#list>
+    
+    <#if bHasSearch>
+            );
+    </#if>
 		 }
 	}
 }