简柏林 / thingskit · Commits

Commit 80fe0985600c7b0d9c24a1ab3371af00e1adf757

Authored by xp.Huang
1 parent 0b4502d1

fix: 修复手机登录查询模板及序列化问题

Inline Side-by-side
Showing 2 changed files with 8 additions and 2 deletions
@@ -4,10 +4,14 @@ import lombok.AllArgsConstructor; @@ -4,10 +4,14 @@ import lombok.AllArgsConstructor;
4 import lombok.Data; 4 import lombok.Data;
5 import lombok.NoArgsConstructor; 5 import lombok.NoArgsConstructor;
6 6
  7 +import java.io.Serializable;
  8 +
7 @Data 9 @Data
8 @AllArgsConstructor 10 @AllArgsConstructor
9 @NoArgsConstructor 11 @NoArgsConstructor
10 -public class CodeTTL { 12 +public class CodeTTL implements Serializable {
  13 +
  14 + private static final long serialVersionUID = -6641996050082078840L;
11 private String code; 15 private String code;
12 private long sendTs; 16 private long sendTs;
13 } 17 }
@@ -10,6 +10,7 @@ import org.apache.commons.lang3.StringUtils; @@ -10,6 +10,7 @@ import org.apache.commons.lang3.StringUtils;
10 import org.springframework.stereotype.Service; 10 import org.springframework.stereotype.Service;
11 import org.springframework.transaction.annotation.Transactional; 11 import org.springframework.transaction.annotation.Transactional;
12 import org.thingsboard.common.util.JacksonUtil; 12 import org.thingsboard.common.util.JacksonUtil;
  13 +import org.thingsboard.server.common.data.id.EntityId;
13 import org.thingsboard.server.common.data.yunteng.config.sms.TkDefaultSmsSenderFactory; 14 import org.thingsboard.server.common.data.yunteng.config.sms.TkDefaultSmsSenderFactory;
14 import org.thingsboard.server.common.data.yunteng.config.sms.SmsProviderConfiguration; 15 import org.thingsboard.server.common.data.yunteng.config.sms.SmsProviderConfiguration;
15 import org.thingsboard.server.common.data.yunteng.config.sms.SmsSender; 16 import org.thingsboard.server.common.data.yunteng.config.sms.SmsSender;
@@ -173,11 +174,12 @@ public class TkSmsServiceImpl implements TkSmsService { @@ -173,11 +174,12 @@ public class TkSmsServiceImpl implements TkSmsService {
173 } 174 }
174 175
175 /** 消息模板是否可用 */ 176 /** 消息模板是否可用 */
  177 + SysUserEntity entity = users.get(0);
176 List<TkMessageTemplateEntity> messageTemplates = 178 List<TkMessageTemplateEntity> messageTemplates =
177 messageTemplateMapper.selectList( 179 messageTemplateMapper.selectList(
178 new QueryWrapper<TkMessageTemplateEntity>() 180 new QueryWrapper<TkMessageTemplateEntity>()
179 .lambda() 181 .lambda()
180 - .eq(TkMessageTemplateEntity::getTenantId, users.get(0).getTenantId()) 182 + .eq(TkMessageTemplateEntity::getTenantId, entity.getLevel() == 3 ? entity.getTenantId() : EntityId.NULL_UUID.toString())
181 .eq(TkMessageTemplateEntity::getStatus, 1) 183 .eq(TkMessageTemplateEntity::getStatus, 1)
182 .eq(TkMessageTemplateEntity::getTemplatePurpose, purpose.name()) 184 .eq(TkMessageTemplateEntity::getTemplatePurpose, purpose.name())
183 .eq(TkMessageTemplateEntity::getMessageType, MessageTypeEnum.PHONE_MESSAGE.name())); 185 .eq(TkMessageTemplateEntity::getMessageType, MessageTypeEnum.PHONE_MESSAGE.name()));