Commit 1a7ddf50c80aa94a3125d5d23848d706ff8c6281

Authored by lijianfa_14810364212
1 parent 4da01340

fix:物模型排序

... ... @@ -568,11 +568,15 @@ public class ThingsModelServiceImpl
568 568 }
569 569
570 570 private TkThingsModelEntity getSortEntity(TkThingsModelEntity entity ,Integer sort ,Boolean isCategory){
571   - return baseMapper.selectOne(
  571 + TkThingsModelEntity sortEntity= baseMapper.selectOne(
572 572 new LambdaQueryWrapper<TkThingsModelEntity>()
573 573 .eq(TkThingsModelEntity::getSort,sort)
574 574 .eq(isCategory, TkThingsModelEntity::getCategoryId, entity.getCategoryId())
575 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 582 // 交换两个对象的 sort 值
... ...