简柏林 / thingskit · Commits

Commit 5d5c40e39e1d5e321b288d2d410511716339bc57

Authored by 芯火源
1 parent 376a8b45

feat: 脚本列表接口只展示激活的接口

Inline Side-by-side
Showing 1 changed file with 3 additions and 2 deletions
... ... @@ -250,8 +250,9 @@ public class TkDeviceScriptServiceImpl
250 250 LambdaQueryWrapper<TkDeviceScriptEntity> queryWrapper =
251 251 new QueryWrapper<TkDeviceScriptEntity>()
252 252 .lambda()
253   - .eq(scriptType!=null,TkDeviceScriptEntity::getScriptType, scriptType).and(s->s
254   - .eq(TkDeviceScriptEntity::getTenantId, tenantId).or(r->r.eq(TkDeviceScriptEntity::getTenantId, EntityId.NULL_UUID.toString())));
  253 + .eq(TkDeviceScriptEntity::getStatus,1)
  254 + .eq(scriptType!=null,TkDeviceScriptEntity::getScriptType, scriptType)
  255 + .and(s->s.eq(TkDeviceScriptEntity::getTenantId, tenantId).or(r->r.eq(TkDeviceScriptEntity::getTenantId, EntityId.NULL_UUID.toString())));
255 256 return baseMapper.selectList(queryWrapper).stream()
256 257 .map(item -> item.getDTO(TkDeviceScriptDTO.class))
257 258 .collect(Collectors.toList());
... ...