From 5b26b453cfaff136cee2fbfd0232dc459178f0b4 Mon Sep 17 00:00:00 2001
From: Renpc-kilig <308442850@qq.com>
Date: Sun, 25 Apr 2021 10:41:19 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=B7=E7=B1=8D=E4=BF=A1=E6=81=AF=EF=BC=8C?=
 =?UTF-8?q?=E6=B5=81=E5=8A=A8=E4=BA=BA=E5=8F=A3bug=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/application.yml                          | 6 +++---
 .../resources/mybatis/mapper/censusmsg/censusmsg-mapper.xml | 3 +++
 .../mapper/floatingpopulation/floatingpopulation-mapper.xml | 2 ++
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 38455dd..a3ac37a 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -20,11 +20,11 @@ spring:
       max-request-size: 1GB
   datasource:
     druid:
-      url: jdbc:mysql://118.89.242.44:3309/db_user_management?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&autoReconnect=true&failOverReadOnly=false&useSSL=false
+      url: jdbc:mysql://localhost:3306/db_user_management?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&autoReconnect=true&failOverReadOnly=false&useSSL=false
       db-type: mysql
       driver-class-name: com.mysql.jdbc.Driver
-      username: usermanagement
-      password: 123456789
+      username: root
+      password: 123456
       initial-size: 2
       min-idle: 2
       max-active: 5
diff --git a/src/main/resources/mybatis/mapper/censusmsg/censusmsg-mapper.xml b/src/main/resources/mybatis/mapper/censusmsg/censusmsg-mapper.xml
index a2e2118..df78141 100644
--- a/src/main/resources/mybatis/mapper/censusmsg/censusmsg-mapper.xml
+++ b/src/main/resources/mybatis/mapper/censusmsg/censusmsg-mapper.xml
@@ -259,6 +259,9 @@
         <if test="keywords != null and keywords != ''">
             AND (
             t1.name_of_householder LIKE CONCAT('%', #{keywords}, '%')
+            OR
+            t1.base_id LIKE CONCAT('%', #{keywords}, '%')
+            )
         </if>
         <if test="startTime != null and startTime != ''">
             AND
diff --git a/src/main/resources/mybatis/mapper/floatingpopulation/floatingpopulation-mapper.xml b/src/main/resources/mybatis/mapper/floatingpopulation/floatingpopulation-mapper.xml
index 5f3a603..5952fa8 100644
--- a/src/main/resources/mybatis/mapper/floatingpopulation/floatingpopulation-mapper.xml
+++ b/src/main/resources/mybatis/mapper/floatingpopulation/floatingpopulation-mapper.xml
@@ -268,6 +268,8 @@
         <if test="keywords != null and keywords != ''">
             AND (
                 t1.card_number LIKE CONCAT('%', #{keywords}, '%')
+                OR
+                t1.base_id LIKE CONCAT('%', #{keywords}, '%')
             )
         </if>
         <if test="startTime != null and startTime != ''">