From 270da3950c2d60860fa6c9cea9ea14a9aaa288dd Mon Sep 17 00:00:00 2001 From: huangdeliang Date: Wed, 2 Dec 2020 01:23:30 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- stdiet-admin/src/main/filters/dev/application.yml | 2 +- .../stdiet/web/controller/custom/SysWxUserInfoController.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/stdiet-admin/src/main/filters/dev/application.yml b/stdiet-admin/src/main/filters/dev/application.yml index ea066bf81..16b1ea9e0 100644 --- a/stdiet-admin/src/main/filters/dev/application.yml +++ b/stdiet-admin/src/main/filters/dev/application.yml @@ -83,7 +83,7 @@ spring: # 主库数据源 master: url: jdbc:mysql://localhost:3306/stdiet_test?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 - password: Ttj4fAHU + password: Ttj4fTtj4fAHUAHU username: root slave: # 从数据源开关/默认关闭 diff --git a/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysWxUserInfoController.java b/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysWxUserInfoController.java index b0378003a..c360c85fa 100644 --- a/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysWxUserInfoController.java +++ b/stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysWxUserInfoController.java @@ -109,7 +109,7 @@ public class SysWxUserInfoController extends BaseController { // 查询微信用户 SysWxUserInfo userInfo = sysWxUserInfoService.selectSysWxUserInfoById(sysWxUserInfo.getOpenid()); if (StringUtils.isNull(userInfo) && StringUtils.isEmpty(sysWxUserInfo.getPhone()) - || StringUtils.isEmpty(userInfo.getPhone()) && StringUtils.isEmpty(sysWxUserInfo.getPhone())) { + || StringUtils.isNotNull(userInfo) && StringUtils.isEmpty(userInfo.getPhone()) && StringUtils.isEmpty(sysWxUserInfo.getPhone())) { return AjaxResult.error(5001, "没有手机号"); }