diff --git a/src/main/java/com/mini/capi/biz/domain/BizFileFolders.java b/src/main/java/com/mini/capi/biz/domain/BizFileFolders.java
index ae9c2e7..914accd 100644
--- a/src/main/java/com/mini/capi/biz/domain/BizFileFolders.java
+++ b/src/main/java/com/mini/capi/biz/domain/BizFileFolders.java
@@ -15,7 +15,7 @@ import lombok.Setter;
*
*
* @author gaoxq
- * @since 2025-11-16
+ * @since 2025-11-18
*/
@Getter
@Setter
@@ -46,13 +46,13 @@ public class BizFileFolders implements Serializable {
* 父文件夹ID(0表示根目录)
*/
@TableField("parent_id")
- private Integer parentId;
+ private String parentId;
/**
* 创建人ID(关联用户表)
*/
@TableField("creator_id")
- private Integer creatorId;
+ private String creatorId;
/**
* 更新时间
diff --git a/src/main/java/com/mini/capi/biz/mapper/BizFileFoldersMapper.java b/src/main/java/com/mini/capi/biz/mapper/BizFileFoldersMapper.java
index 9c4b6a2..94ba1b7 100644
--- a/src/main/java/com/mini/capi/biz/mapper/BizFileFoldersMapper.java
+++ b/src/main/java/com/mini/capi/biz/mapper/BizFileFoldersMapper.java
@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
*
*
* @author gaoxq
- * @since 2025-11-16
+ * @since 2025-11-18
*/
public interface BizFileFoldersMapper extends BaseMapper {
diff --git a/src/main/java/com/mini/capi/biz/viewController.java b/src/main/java/com/mini/capi/biz/viewController.java
index ab2e7c9..3f4aca3 100644
--- a/src/main/java/com/mini/capi/biz/viewController.java
+++ b/src/main/java/com/mini/capi/biz/viewController.java
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.mini.capi.api.service.sysService;
import com.mini.capi.biz.domain.*;
import com.mini.capi.biz.service.*;
+import com.mini.capi.model.info.FolderTree;
import com.mini.capi.model.info.RunInfo;
import com.mini.capi.utils.DateUtils;
import com.mini.capi.utils.SqlUtils;
@@ -14,6 +15,7 @@ import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.GetMapping;
+import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
@@ -152,10 +154,18 @@ public class viewController {
@GetMapping("/biz/dataDoc")
public String getDataDox(Model model) {
List files = filesService.list();
- List folders = foldersService.list();
-
+ List folderTrees = new ArrayList<>();
+ QueryWrapper parentWrapper = new QueryWrapper<>();
+ parentWrapper.eq("parent_id", "0");
+ List folders = foldersService.list(parentWrapper);
+ for (BizFileFolders fileFolder : folders) {
+ QueryWrapper childWrapper = new QueryWrapper<>();
+ childWrapper.eq("parent_id", fileFolder.getFolderId());
+ List childFolders = foldersService.list(childWrapper);
+ folderTrees.add(new FolderTree(fileFolder, childFolders));
+ }
model.addAttribute("files", files);
- model.addAttribute("folders", folders);
+ model.addAttribute("folderTrees", folderTrees);
return "file";
}
diff --git a/src/main/java/com/mini/capi/model/info/FolderTree.java b/src/main/java/com/mini/capi/model/info/FolderTree.java
new file mode 100644
index 0000000..074f54b
--- /dev/null
+++ b/src/main/java/com/mini/capi/model/info/FolderTree.java
@@ -0,0 +1,26 @@
+package com.mini.capi.model.info;
+
+import com.mini.capi.biz.domain.BizFileFolders;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+public class FolderTree implements Serializable {
+
+ private BizFileFolders folder;
+
+ private List childFolders;
+
+
+ public FolderTree() {
+ }
+
+
+ public FolderTree(BizFileFolders folder, List childFolders) {
+ this.folder = folder;
+ this.childFolders = childFolders;
+ }
+
+}
diff --git a/src/main/java/com/mini/capi/mybatis/demo.java b/src/main/java/com/mini/capi/mybatis/demo.java
index 7b4daca..7d765f9 100644
--- a/src/main/java/com/mini/capi/mybatis/demo.java
+++ b/src/main/java/com/mini/capi/mybatis/demo.java
@@ -29,7 +29,7 @@ public class demo {
.pathInfo(Collections.singletonMap(OutputFile.xml, System.getProperty("user.dir") + "/src/main/resources/mapper"));
})
.strategyConfig(builder -> {
- builder.addInclude("data_table_info,data_table_field")
+ builder.addInclude("biz_file_folders")
.addTablePrefix("biz_,erp_")
.entityBuilder()
.enableLombok()
diff --git a/src/main/resources/templates/file.html b/src/main/resources/templates/file.html
index 49d3975..20d28f0 100644
--- a/src/main/resources/templates/file.html
+++ b/src/main/resources/templates/file.html
@@ -1,11 +1,11 @@
-
+
文档中心
-
-
+
+