|
@@ -118,11 +118,12 @@ public class FilesController {
|
|
@RequestParam(required = false) LocalDateTime endTime,
|
|
@RequestParam(required = false) LocalDateTime endTime,
|
|
@RequestParam(required = false) Boolean isDeleted,
|
|
@RequestParam(required = false) Boolean isDeleted,
|
|
@RequestParam(required = false) String fileType,
|
|
@RequestParam(required = false) String fileType,
|
|
|
|
+ @RequestParam(required = false) String userName,
|
|
@RequestParam int current,
|
|
@RequestParam int current,
|
|
@RequestParam int size) {
|
|
@RequestParam int size) {
|
|
|
|
|
|
// 调用服务层方法
|
|
// 调用服务层方法
|
|
- CommonPage<FilesUpload> resultPage = filesService.queryFiles(filesName, startTime, endTime, isDeleted, fileType, current, size);
|
|
|
|
|
|
+ CommonPage<FilesUpload> resultPage = filesService.queryFiles(filesName, startTime, endTime, isDeleted, fileType, userName, current, size);
|
|
|
|
|
|
// 返回封装好的分页结果
|
|
// 返回封装好的分页结果
|
|
return R.ok(resultPage);
|
|
return R.ok(resultPage);
|