Tenlion/btxtgxq-system-population
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

application冲突解决

Browse Source
This commit is contained in:
wans 2021-04-28 09:43:39 +08:00
commit e79bdddf02
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/resources/application.yml
View File

@ -20,7 +20,7 @@ spring:
max-request-size: 1GB max-request-size: 1GB
datasource: datasource:
druid: druid:
url: jdbc:mysql://192.168.0.109/db_cloud_population?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 db-type: mysql
driver-class-name: com.mysql.jdbc.Driver driver-class-name: com.mysql.jdbc.Driver
username: root username: root

3
src/main/resources/mybatis/mapper/censusmsg/censusmsg-mapper.xml
View File

@ -259,6 +259,9 @@
<if test="keywords != null and keywords != ''"> <if test="keywords != null and keywords != ''">
AND ( AND (
t1.name_of_householder LIKE CONCAT('%', #{keywords}, '%') t1.name_of_householder LIKE CONCAT('%', #{keywords}, '%')
OR
t1.base_id LIKE CONCAT('%', #{keywords}, '%')
)
</if> </if>
<if test="startTime != null and startTime != ''"> <if test="startTime != null and startTime != ''">
AND AND

2
src/main/resources/mybatis/mapper/floatingpopulation/floatingpopulation-mapper.xml
View File

@ -268,6 +268,8 @@
<if test="keywords != null and keywords != ''"> <if test="keywords != null and keywords != ''">
AND ( AND (
t1.card_number LIKE CONCAT('%', #{keywords}, '%') t1.card_number LIKE CONCAT('%', #{keywords}, '%')
OR
t1.base_id LIKE CONCAT('%', #{keywords}, '%')
) )
</if> </if>
<if test="startTime != null and startTime != ''"> <if test="startTime != null and startTime != ''">