|
@@ -112,7 +112,7 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> impl
|
|
.le(SysDict::getCreateTime, pageInfo.getEndCreateTime())
|
|
.le(SysDict::getCreateTime, pageInfo.getEndCreateTime())
|
|
.like(SysDict::getMsg)
|
|
.like(SysDict::getMsg)
|
|
.build()
|
|
.build()
|
|
- .orderByDesc(!Emptys.check(page.getOrders()), SysDict::getCreateTime)
|
|
|
|
|
|
+ .orderByAsc(!Emptys.check(page.getOrders()), SysDict::getOrders)
|
|
.and(StringUtils.isEmpty(pageInfo.getPaterCode()), sysDictLambdaQueryWrapper -> sysDictLambdaQueryWrapper
|
|
.and(StringUtils.isEmpty(pageInfo.getPaterCode()), sysDictLambdaQueryWrapper -> sysDictLambdaQueryWrapper
|
|
.isNull(SysDict::getPaterCode)
|
|
.isNull(SysDict::getPaterCode)
|
|
.or()
|
|
.or()
|
|
@@ -129,7 +129,8 @@ public class SysDictServiceImpl extends ServiceImpl<SysDictMapper, SysDict> impl
|
|
.in(SysDict::getId, selectList.getIds())
|
|
.in(SysDict::getId, selectList.getIds())
|
|
.in(SysDict::getCode, selectList.getCodes())
|
|
.in(SysDict::getCode, selectList.getCodes())
|
|
.in(SysDict::getPaterCode, selectList.getPaterCodes())
|
|
.in(SysDict::getPaterCode, selectList.getPaterCodes())
|
|
- .build();
|
|
|
|
|
|
+ .build()
|
|
|
|
+ .orderByAsc(SysDict::getOrders);
|
|
List<SysDict> list = list(lambdaQueryWrapper);
|
|
List<SysDict> list = list(lambdaQueryWrapper);
|
|
return R.ok(copy(SysDictDto.Vo.class, list));
|
|
return R.ok(copy(SysDictDto.Vo.class, list));
|
|
}
|
|
}
|