diff --git a/src/main/java/com/whdc/service/impl/UserServiceImpl.java b/src/main/java/com/whdc/service/impl/UserServiceImpl.java index 6bf594c..3d55530 100644 --- a/src/main/java/com/whdc/service/impl/UserServiceImpl.java +++ b/src/main/java/com/whdc/service/impl/UserServiceImpl.java @@ -15,6 +15,7 @@ import com.whdc.model.vo.LoginVo; import com.whdc.service.IUserService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.whdc.utils.HttpUtil; +import org.apache.commons.collections.CollectionUtils; import org.apache.commons.lang3.StringUtils; import com.whdc.utils.ResultJson; import lombok.extern.slf4j.Slf4j; @@ -134,7 +135,7 @@ public class UserServiceImpl extends ServiceImpl implements IU // 匹配手机号是否存在 LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper(); queryWrapper.eq(AddressBook::getPhone, phone); - if (addressBookMapper.selectOne(queryWrapper) == null) { + if (CollectionUtils.isEmpty(addressBookMapper.selectList(queryWrapper))) { throw new MyException("当前手机号不存在"); } // 判断是否以发送 @@ -158,11 +159,11 @@ public class UserServiceImpl extends ServiceImpl implements IU // 匹配手机号是否存在 LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper(); queryWrapper.eq(AddressBook::getPhone, phone); - AddressBook addressBook = addressBookMapper.selectOne(queryWrapper); - if (addressBook == null) { + List coll = addressBookMapper.selectList(queryWrapper); + if (CollectionUtils.isEmpty(coll)) { throw new MyException("当前手机号不存在"); } - + AddressBook addressBook = coll.get(0); // 判断是否以发送 String key = REDIS_KEY + "code:" + phone; String pushCode = String.valueOf(stringRedisTemplate.opsForValue().get(key)); diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 4ec63f2..b3e3180 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -8,12 +8,12 @@ spring: datasource: type: com.alibaba.druid.pool.DruidDataSource driver-class-name: dm.jdbc.driver.DmDriver - url: jdbc:dm://local.gunshiiot.com:5236?schema=FXKH_TXL - username: SYSDBA - password: SYSDBA001 -# url: jdbc:dm://10.42.6.247:5236?schema=FXKH_TXL -# username: SHZH -# password: Shzh_890 +# url: jdbc:dm://local.gunshiiot.com:5236?schema=FXKH_TXL +# username: SYSDBA +# password: SYSDBA001 + url: jdbc:dm://10.42.6.247:5236?schema=FXKH_TXL + username: SHZH + password: Shzh_890 druid: initialSize: 5 minIdle: 5 diff --git a/src/main/resources/mapper/AddressBookMapper.xml b/src/main/resources/mapper/AddressBookMapper.xml index c8483a3..10d1cea 100644 --- a/src/main/resources/mapper/AddressBookMapper.xml +++ b/src/main/resources/mapper/AddressBookMapper.xml @@ -33,8 +33,8 @@ AND AB.PHONE LIKE CONCAT('', #{dto.phone}, '%') - ORDER BY F.SORT NULLS LAST,F.SORT,AB.SORT GROUP BY AB.ID + ORDER BY F.SORT NULLS LAST,F.SORT,AB.SORT