Showing
1 changed file
with
3 additions
and
2 deletions
| @@ -250,8 +250,9 @@ public class TkDeviceScriptServiceImpl | @@ -250,8 +250,9 @@ public class TkDeviceScriptServiceImpl | ||
| 250 | LambdaQueryWrapper<TkDeviceScriptEntity> queryWrapper = | 250 | LambdaQueryWrapper<TkDeviceScriptEntity> queryWrapper = |
| 251 | new QueryWrapper<TkDeviceScriptEntity>() | 251 | new QueryWrapper<TkDeviceScriptEntity>() |
| 252 | .lambda() | 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 | return baseMapper.selectList(queryWrapper).stream() | 256 | return baseMapper.selectList(queryWrapper).stream() |
| 256 | .map(item -> item.getDTO(TkDeviceScriptDTO.class)) | 257 | .map(item -> item.getDTO(TkDeviceScriptDTO.class)) |
| 257 | .collect(Collectors.toList()); | 258 | .collect(Collectors.toList()); |