From ec6e9a643aae334a9d0f3fca24f6c7af0e709f49 Mon Sep 17 00:00:00 2001
From: liquanyu <liquanyu@lymsh.com>
Date: Tue, 15 Nov 2022 17:39:55 +0800
Subject: [PATCH] =?UTF-8?q?=E8=82=8C=E8=90=8E=E7=BC=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/lyms/platform/operate/web/facade/SmnFacade.java | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmnFacade.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmnFacade.java
index 0aff24c..208d167 100644
--- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmnFacade.java
+++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/facade/SmnFacade.java
@@ -33,6 +33,7 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.util.*;
+import java.util.regex.Pattern;
 
 @Component
 public class SmnFacade {
@@ -203,9 +204,9 @@ public class SmnFacade {
         if(StringUtils.isNotEmpty(param.getHusbandQueryNo()))
         {
             query.addCriteria(new Criteria().
-                    orOperator(Criteria.where("husbandSmns.husbandPhone").is(param.getHusbandQueryNo()),
-                            Criteria.where("husbandSmns.husbandCardNo").is(param.getHusbandQueryNo()),
-                            Criteria.where("husbandSmns.husbandName").is(param.getHusbandQueryNo())));
+                    orOperator(Criteria.where("husbandSmns.husbandPhone").regex(Pattern.compile("^.*"+param.getHusbandQueryNo()+".*$")),
+                            Criteria.where("husbandSmns.husbandCardNo").regex(Pattern.compile("^.*"+param.getHusbandQueryNo()+".*$")),
+                            Criteria.where("husbandSmns.husbandName").regex(Pattern.compile("^.*"+param.getHusbandQueryNo()+".*$"))));
         }
         String husbandYbNum = param.getHusbandYbNum();
         if (StringUtils.isNotEmpty(husbandYbNum)) {
@@ -251,7 +252,9 @@ public class SmnFacade {
 
         if(StringUtils.isNotEmpty(param.getQueryNo()))
         {
-            query.addCriteria(new Criteria().orOperator(Criteria.where("phone").is(param.getQueryNo()), Criteria.where("cardNo").is(param.getQueryNo()), Criteria.where("username").regex("/"+param.getQueryNo()+"/")));
+            query.addCriteria(new Criteria().orOperator(Criteria.where("phone").regex(Pattern.compile("^.*"+param.getQueryNo()+".*$")),
+                    Criteria.where("cardNo").regex(Pattern.compile("^.*"+param.getQueryNo()+".*$")),
+                    Criteria.where("username").regex(Pattern.compile("^.*"+param.getQueryNo()+".*$"))));
         }
         String ybNum = param.getYbNum();
         if (StringUtils.isNotEmpty(ybNum)) {
@@ -342,6 +345,7 @@ public class SmnFacade {
             query.with(new Sort(Sort.Direction.DESC, "created"));
         }
 
+        System.out.println(query.toString());
         long count = mongoTemplate.count(query, SmnModel.class);
         param.mysqlBuild((int) count);
         query.skip(param.getOffset()).limit(param.getLimit());
-- 
1.8.3.1