!346 file路径Bug

Merge pull request !346 from 与或非/issues/I5KG6T
This commit is contained in:
芋道源码 2023-01-04 01:19:37 +00:00 committed by Gitee
commit 427d031ba5
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F

View File

@ -1,11 +1,14 @@
package cn.iocoder.yudao.module.infra.dal.mysql.file; package cn.iocoder.yudao.module.infra.dal.mysql.file;
import cn.hutool.core.collection.CollUtil;
import cn.iocoder.yudao.framework.file.core.client.db.DBFileContentFrameworkDAO; import cn.iocoder.yudao.framework.file.core.client.db.DBFileContentFrameworkDAO;
import cn.iocoder.yudao.module.infra.dal.dataobject.file.FileContentDO; import cn.iocoder.yudao.module.infra.dal.dataobject.file.FileContentDO;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import org.springframework.stereotype.Repository; import org.springframework.stereotype.Repository;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.util.List;
import java.util.Optional;
@Repository @Repository
public class FileContentDAOImpl implements DBFileContentFrameworkDAO { public class FileContentDAOImpl implements DBFileContentFrameworkDAO {
@ -27,9 +30,11 @@ public class FileContentDAOImpl implements DBFileContentFrameworkDAO {
@Override @Override
public byte[] selectContent(Long configId, String path) { public byte[] selectContent(Long configId, String path) {
FileContentDO fileContentDO = fileContentMapper.selectOne( List<FileContentDO> list = fileContentMapper.selectList(
buildQuery(configId, path).select(FileContentDO::getContent)); buildQuery(configId, path).select(FileContentDO::getContent).orderByDesc(FileContentDO::getId));
return fileContentDO != null ? fileContentDO.getContent() : null; return Optional.ofNullable(CollUtil.getFirst(list))
.map(FileContentDO::getContent)
.orElse(null);
} }
private LambdaQueryWrapper<FileContentDO> buildQuery(Long configId, String path) { private LambdaQueryWrapper<FileContentDO> buildQuery(Long configId, String path) {