Commit e012087dc203570b4fa874242415d99ae103034e

Authored by 云中非
1 parent 4fcdcbb6

fix(DEFECT-420): 推送短信失败问题修复

1、获取短信模板时获取到其他人默认问题修复
2、获取到未启用模板问题修复
@@ -111,9 +111,9 @@ public class YtSmsServiceImpl implements YtSmsService { @@ -111,9 +111,9 @@ public class YtSmsServiceImpl implements YtSmsService {
111 @Transactional 111 @Transactional
112 public boolean sendSmsCode(String phoneNumber,MsgTemplatePurposeEnum purpose) { 112 public boolean sendSmsCode(String phoneNumber,MsgTemplatePurposeEnum purpose) {
113 // 检查手机号码是否存在系统,以免乱发消息 113 // 检查手机号码是否存在系统,以免乱发消息
114 - if (userMapper  
115 - .selectList(new QueryWrapper<User>().lambda().eq(User::getPhoneNumber, phoneNumber))  
116 - .isEmpty()) { 114 + List<User> users = userMapper
  115 + .selectList(new QueryWrapper<User>().lambda().eq(User::getPhoneNumber, phoneNumber));
  116 + if (users.isEmpty()) {
117 throw new YtDataValidationException("电话号码未在系统注册,请联系你的管理员"); 117 throw new YtDataValidationException("电话号码未在系统注册,请联系你的管理员");
118 } 118 }
119 // 获取是否有验证码存在,防止发送数量过多 119 // 获取是否有验证码存在,防止发送数量过多
@@ -140,8 +140,10 @@ public class YtSmsServiceImpl implements YtSmsService { @@ -140,8 +140,10 @@ public class YtSmsServiceImpl implements YtSmsService {
140 messageTemplateMapper.selectList( 140 messageTemplateMapper.selectList(
141 new QueryWrapper<MessageTemplate>() 141 new QueryWrapper<MessageTemplate>()
142 .lambda() 142 .lambda()
143 - .eq(MessageTemplate::getTemplatePurpose, purpose.name())  
144 - .eq(MessageTemplate::getMessageType, MessageTypeEnum.PHONE_MESSAGE.name())); 143 + .eq(MessageTemplate::getTenantId, users.get(0).getTenantId())
  144 + .eq(MessageTemplate::getStatus, 1)
  145 + .eq(MessageTemplate::getTemplatePurpose, purpose.name())
  146 + .eq(MessageTemplate::getMessageType, MessageTypeEnum.PHONE_MESSAGE.name()));
145 if (messageTemplates.isEmpty()) { 147 if (messageTemplates.isEmpty()) {
146 throw new YtDataValidationException("no sms provider config"); 148 throw new YtDataValidationException("no sms provider config");
147 } 149 }