|
@@ -55,6 +55,7 @@ public class DictController extends BaseController {
|
|
|
.or()
|
|
.or()
|
|
|
.like(DictType::getDictName, dictType.getKeyword()));
|
|
.like(DictType::getDictName, dictType.getKeyword()));
|
|
|
}
|
|
}
|
|
|
|
|
+ queryWrapper.orderByAsc(DictType::getId);
|
|
|
Page<DictType> dictTypePage = new Page<>(dictType.getPageNo(),dictType.getPageSize());
|
|
Page<DictType> dictTypePage = new Page<>(dictType.getPageNo(),dictType.getPageSize());
|
|
|
Page<DictType> pageInfo = dictTypeService.page(dictTypePage,queryWrapper);
|
|
Page<DictType> pageInfo = dictTypeService.page(dictTypePage,queryWrapper);
|
|
|
return Result.success(pageInfo);
|
|
return Result.success(pageInfo);
|
|
@@ -83,6 +84,7 @@ public class DictController extends BaseController {
|
|
|
LambdaQueryWrapper<DictData> queryWrapper = new LambdaQueryWrapper<>();
|
|
LambdaQueryWrapper<DictData> queryWrapper = new LambdaQueryWrapper<>();
|
|
|
queryWrapper.eq(StringUtils.isNotBlank(dictData.getDictType()), DictData::getDictType, dictData.getDictType());
|
|
queryWrapper.eq(StringUtils.isNotBlank(dictData.getDictType()), DictData::getDictType, dictData.getDictType());
|
|
|
queryWrapper.eq(dictData.getStatus() != null, DictData::getStatus, dictData.getStatus());
|
|
queryWrapper.eq(dictData.getStatus() != null, DictData::getStatus, dictData.getStatus());
|
|
|
|
|
+ queryWrapper.orderByAsc(DictData::getId);
|
|
|
Page<DictData> pageInfo = dictDataService.page(dictDataPage,queryWrapper);
|
|
Page<DictData> pageInfo = dictDataService.page(dictDataPage,queryWrapper);
|
|
|
return Result.success(pageInfo);
|
|
return Result.success(pageInfo);
|
|
|
}
|
|
}
|