Showing
1 changed file
with
2 additions
and
1 deletions
| ... | ... | @@ -208,7 +208,8 @@ public class ThingsModelServiceImpl |
| 208 | 208 | .eq(TkThingsModelEntity::getTenantId, tenantId) |
| 209 | 209 | .eq(TkThingsModelEntity::getDeviceProfileId, deviceProfileId) |
| 210 | 210 | .eq(!typeEnum.equals(FunctionTypeEnum.all), TkThingsModelEntity::getFunctionType, typeEnum) |
| 211 | - .eq(TkThingsModelEntity::getStatus, StatusEnum.ENABLE.getIndex())); | |
| 211 | + .eq(TkThingsModelEntity::getStatus, StatusEnum.ENABLE.getIndex()) | |
| 212 | + .orderBy(true, true, TkThingsModelEntity::getSort)); | |
| 212 | 213 | if (entityList.isEmpty()) { |
| 213 | 214 | return null; |
| 214 | 215 | } | ... | ... |