附件查看

src/main/java/com/xjrsoft/module/system/controller/FileController.java

@@ -81,10 +81,10 @@ public class FileController {
     public R list(@Valid FileListDto dto) {
 
         List<FileListVo> list = new ArrayList<>();
-        if(dto.getFolderId() != null || dto.getFileName() != null && dto.getProcessId() != null){
+        if(dto.getFolderId() != null || dto.getFileName() != null || dto.getProcessId() != null){
            list = fileService.selectJoinList(FileListVo.class, MPJWrappers.<File>lambdaJoin()
                     .like(StrUtil.isNotBlank(dto.getFileName()), File::getFileName, dto.getFileName())
-                    .eq(ObjectUtil.isNotNull(dto.getFolderId()) && StrUtil.isNotBlank(dto.getProcessId()), File::getFolderId, dto.getFolderId())
+                    .eq(ObjectUtil.isNotNull(dto.getFolderId()), File::getFolderId, dto.getFolderId())
                     .eq(StrUtil.isNotBlank(dto.getProcessId()), File::getProcessId, dto.getProcessId())
                     .select(File::getId)
                     .select(File.class, x -> VoToColumnUtil.fieldsToColumns(FileListVo.class).contains(x.getProperty()))