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 @@ AND ( t1.name_of_householder LIKE CONCAT('%', #{keywords}, '%') + OR + t1.base_id LIKE CONCAT('%', #{keywords}, '%') + ) 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 @@ AND ( t1.card_number LIKE CONCAT('%', #{keywords}, '%') + OR + t1.base_id LIKE CONCAT('%', #{keywords}, '%') )