From 28a60a0ab74773e49f18d3c7b7cfeb2593c73129 Mon Sep 17 00:00:00 2001 From: fl <3098731433@qq.com> Date: Thu, 27 Feb 2025 15:33:50 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=90=8C=E6=AD=A5=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=EF=BC=8Cid=E4=B8=BAnull=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application.properties | 4 ++-- src/main/resources/mappers/wechatData/WechatDataMapper.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 316308b..8baa28f 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -4,9 +4,9 @@ server.servlet.context-path=/gz_att_wechat spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver #公司开发环境 -spring.datasource.url=jdbc:mysql://192.168.0.14:1103/gz_attendance_wechat?characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useUnicode=true&useSSL=false&serverTimezone=Asia/Shanghai&allowMultiQueries=true +spring.datasource.url=jdbc:mysql://192.168.0.14:4418/gz_attendance_wechat?characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useUnicode=true&useSSL=false&serverTimezone=Asia/Shanghai&allowMultiQueries=true spring.datasource.username=root -spring.datasource.password=dszadmin@ynreal14! +spring.datasource.password=Bonus@admin123! #生产真实环境 #spring.datasource.url=jdbc:mysql://127.0.0.1:13306/gz_attendance_wechat?characterEncoding=utf8&connectTimeout=1000&socketTimeout=3000&autoReconnect=true&useUnicode=true&useSSL=false&serverTimezone=Asia/Shanghai&allowMultiQueries=true diff --git a/src/main/resources/mappers/wechatData/WechatDataMapper.xml b/src/main/resources/mappers/wechatData/WechatDataMapper.xml index d0561ae..d4aa741 100644 --- a/src/main/resources/mappers/wechatData/WechatDataMapper.xml +++ b/src/main/resources/mappers/wechatData/WechatDataMapper.xml @@ -177,7 +177,7 @@ select * from leave_apply_wechat where is_active = '1' - and (id = #{id} + and (id = #{id} or id is null or is_update = #{isUpdate})