Showing
1 changed file
with
5 additions
and
1 deletions
| @@ -568,11 +568,15 @@ public class ThingsModelServiceImpl | @@ -568,11 +568,15 @@ public class ThingsModelServiceImpl | ||
| 568 | } | 568 | } |
| 569 | 569 | ||
| 570 | private TkThingsModelEntity getSortEntity(TkThingsModelEntity entity ,Integer sort ,Boolean isCategory){ | 570 | private TkThingsModelEntity getSortEntity(TkThingsModelEntity entity ,Integer sort ,Boolean isCategory){ |
| 571 | - return baseMapper.selectOne( | 571 | + TkThingsModelEntity sortEntity= baseMapper.selectOne( |
| 572 | new LambdaQueryWrapper<TkThingsModelEntity>() | 572 | new LambdaQueryWrapper<TkThingsModelEntity>() |
| 573 | .eq(TkThingsModelEntity::getSort,sort) | 573 | .eq(TkThingsModelEntity::getSort,sort) |
| 574 | .eq(isCategory, TkThingsModelEntity::getCategoryId, entity.getCategoryId()) | 574 | .eq(isCategory, TkThingsModelEntity::getCategoryId, entity.getCategoryId()) |
| 575 | .eq(!isCategory, TkThingsModelEntity::getDeviceProfileId, entity.getDeviceProfileId())); | 575 | .eq(!isCategory, TkThingsModelEntity::getDeviceProfileId, entity.getDeviceProfileId())); |
| 576 | + if(sortEntity==null){ | ||
| 577 | + sortEntity=getSortEntityList(entity,isCategory).stream().filter(s->{return s.getSort().intValue()==sort.intValue();}).findFirst().get(); | ||
| 578 | + } | ||
| 579 | + return sortEntity; | ||
| 576 | } | 580 | } |
| 577 | 581 | ||
| 578 | // 交换两个对象的 sort 值 | 582 | // 交换两个对象的 sort 值 |