Merge remote-tracking branch 'origin/master'

This commit is contained in:
guofeihu
2024-08-28 11:29:26 +08:00
7 changed files with 43 additions and 31 deletions

View File

@@ -114,7 +114,7 @@ public class REvaluationDataServiceImpl extends ServiceImpl<RUploadEvaluationDat
public Page<UploadEvaluationDataVo> getEvaluationData(UploadDataParam param) {
LambdaQueryWrapper<RUploadEvaluationDataD> lambdaQueryWrapper = this.getDeptLevel(param);
//默认按照省名称排序
lambdaQueryWrapper.orderByDesc(RUploadEvaluationDataD::getProvinceName);
//lambdaQueryWrapper.orderByDesc(RUploadEvaluationDataD::getProvinceName);
Page<RUploadEvaluationDataD> page = this.page(new Page<>(PageFactory.getPageNum(param), PageFactory.getPageSize(param)), lambdaQueryWrapper);
List<UploadEvaluationDataVo> voList = BeanUtil.copyToList(page.getRecords(), UploadEvaluationDataVo.class);
if (CollectionUtil.isNotEmpty(voList)) {