Parcourir la source

附件管理搜索接口添加创建者名称查询

zhaojinyu il y a 1 mois
Parent
commit
2f9625cd5b

+ 2 - 1
base-modules/service-file/src/main/java/com/ruoyi/file/controller/FilesController.java

@@ -118,11 +118,12 @@ public class FilesController {
             @RequestParam(required = false) LocalDateTime endTime,
             @RequestParam(required = false) Boolean isDeleted,
             @RequestParam(required = false) String fileType,
+            @RequestParam(required = false) String userName,
             @RequestParam int current,
             @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);

+ 1 - 1
base-modules/service-file/src/main/java/com/ruoyi/file/service/FilesService.java

@@ -15,5 +15,5 @@ public interface FilesService extends IService<FilesUpload> {
     void deleteFile(Integer id, String userid, String userName);
 
     // 查询方法
-    CommonPage<FilesUpload> queryFiles(String filesName, LocalDateTime startTime, LocalDateTime endTime, Boolean isDeleted, String fileType, int current, int size);
+    CommonPage<FilesUpload> queryFiles(String filesName, LocalDateTime startTime, LocalDateTime endTime, Boolean isDeleted, String fileType, String userName, int current, int size);
 }

+ 5 - 1
base-modules/service-file/src/main/java/com/ruoyi/file/service/impl/FilesServiceImpl.java

@@ -175,7 +175,7 @@ public class FilesServiceImpl extends ServiceImpl<FilesMapper, FilesUpload> impl
     }
 
     @Override
-    public CommonPage<FilesUpload> queryFiles(String filesName, LocalDateTime startTime, LocalDateTime endTime, Boolean isDeleted, String fileType, int current, int size) {
+    public CommonPage<FilesUpload> queryFiles(String filesName, LocalDateTime startTime, LocalDateTime endTime, Boolean isDeleted, String fileType, String userName, int current, int size) {
         QueryWrapper<FilesUpload> queryWrapper = new QueryWrapper<>();
 
         // 默认查询未删除的文件
@@ -202,6 +202,10 @@ public class FilesServiceImpl extends ServiceImpl<FilesMapper, FilesUpload> impl
             queryWrapper.eq("type", fileType);
         }
 
+        if (userName != null && !userName.isEmpty()) {
+            queryWrapper.like("create_by", userName);
+        }
+
         // 按照创建时间倒序排列
         queryWrapper.orderByDesc("create_time");