From 3a5de3bf55f72a890bc05b92d529b8584167a565 Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期二, 27 二月 2024 14:02:18 +0800
Subject: [PATCH] 修改映射文件的目录编码-1
---
src/main/java/com/lf/server/service/all/BaseUploadService.java | 9 +--------
src/main/java/com/lf/server/service/data/DirService.java | 5 ++++-
2 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/lf/server/service/all/BaseUploadService.java b/src/main/java/com/lf/server/service/all/BaseUploadService.java
index 2290e01..a868900 100644
--- a/src/main/java/com/lf/server/service/all/BaseUploadService.java
+++ b/src/main/java/com/lf/server/service/all/BaseUploadService.java
@@ -552,17 +552,10 @@
*/
private void setDircode(List<MetaFileEntity> list, DirEntity dir) {
List<DirEntity> dirs = dirService.selectRecursiveById(dir.getId());
- if (null == dirs || dirs.isEmpty()) {
- for (MetaFileEntity mfe : list) {
- mfe.setDircode(dir.getCode());
- }
- return;
- }
-
for (MetaFileEntity mfe : list) {
String code= dir.getCode();
String fileName = mfe.getName().toLowerCase();
- String filePath = mfe.getPath().replace("/", "\\").toLowerCase();
+ String filePath = mfe.getPath().toLowerCase().replace("/", "\\");
for(DirEntity de : dirs){
if (filePath.contains(de.getFullName().toLowerCase() + "\\" + fileName)) {
code=de.getCode();
diff --git a/src/main/java/com/lf/server/service/data/DirService.java b/src/main/java/com/lf/server/service/data/DirService.java
index f435d3f..2176687 100644
--- a/src/main/java/com/lf/server/service/data/DirService.java
+++ b/src/main/java/com/lf/server/service/data/DirService.java
@@ -11,6 +11,7 @@
import org.springframework.stereotype.Service;
import java.io.File;
+import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -87,7 +88,9 @@
@Override
public List<DirEntity> selectRecursiveById(Integer id) {
- return dirMapper.selectRecursiveById(id);
+ List<DirEntity> list = dirMapper.selectRecursiveById(id);
+
+ return null == list ? new ArrayList<>() : list;
}
@Override
--
Gitblit v1.9.3