...
|
...
|
@@ -10,6 +10,7 @@ import org.apache.commons.lang3.StringUtils; |
10
|
10
|
import org.springframework.stereotype.Service;
|
11
|
11
|
import org.springframework.transaction.annotation.Transactional;
|
12
|
12
|
import org.thingsboard.common.util.JacksonUtil;
|
|
13
|
+import org.thingsboard.server.common.data.id.EntityId;
|
13
|
14
|
import org.thingsboard.server.common.data.yunteng.config.sms.TkDefaultSmsSenderFactory;
|
14
|
15
|
import org.thingsboard.server.common.data.yunteng.config.sms.SmsProviderConfiguration;
|
15
|
16
|
import org.thingsboard.server.common.data.yunteng.config.sms.SmsSender;
|
...
|
...
|
@@ -173,11 +174,12 @@ public class TkSmsServiceImpl implements TkSmsService { |
173
|
174
|
}
|
174
|
175
|
|
175
|
176
|
/** 消息模板是否可用 */
|
|
177
|
+ SysUserEntity entity = users.get(0);
|
176
|
178
|
List<TkMessageTemplateEntity> messageTemplates =
|
177
|
179
|
messageTemplateMapper.selectList(
|
178
|
180
|
new QueryWrapper<TkMessageTemplateEntity>()
|
179
|
181
|
.lambda()
|
180
|
|
- .eq(TkMessageTemplateEntity::getTenantId, users.get(0).getTenantId())
|
|
182
|
+ .eq(TkMessageTemplateEntity::getTenantId, entity.getLevel() == 3 ? entity.getTenantId() : EntityId.NULL_UUID.toString())
|
181
|
183
|
.eq(TkMessageTemplateEntity::getStatus, 1)
|
182
|
184
|
.eq(TkMessageTemplateEntity::getTemplatePurpose, purpose.name())
|
183
|
185
|
.eq(TkMessageTemplateEntity::getMessageType, MessageTypeEnum.PHONE_MESSAGE.name()));
|
...
|
...
|
|