From 661efd3b4b34c4d0b3c9ee1e51badd3111692abc Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期三, 29 三月 2023 09:04:16 +0800
Subject: [PATCH] 1
---
src/main/java/com/lf/server/service/show/DataLibService.java | 2 +-
src/main/resources/mapper/data/DirMapper.xml | 9 ++++++---
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/lf/server/service/show/DataLibService.java b/src/main/java/com/lf/server/service/show/DataLibService.java
index 5feedcb..8018704 100644
--- a/src/main/java/com/lf/server/service/show/DataLibService.java
+++ b/src/main/java/com/lf/server/service/show/DataLibService.java
@@ -160,7 +160,7 @@
}
/**
- * 鏌ヨ鏁版嵁
+ * 鏌ヨ鏁版嵁+闄勪欢
*/
private void queryData(DownloadReqEntity dr, Map<String, List<?>> dataMap, Map<String, List<AttachEntity>> annexMap) {
for (String enity : dr.getEntities()) {
diff --git a/src/main/resources/mapper/data/DirMapper.xml b/src/main/resources/mapper/data/DirMapper.xml
index 05bcaae..27ba5d6 100644
--- a/src/main/resources/mapper/data/DirMapper.xml
+++ b/src/main/resources/mapper/data/DirMapper.xml
@@ -13,19 +13,22 @@
</select>
<select id="selectDirRoot" resultType="com.lf.server.entity.data.DirEntity">
- select a.*, fn_get_fullname(a.code, 2) fullName from lf.sys_dir a where pid = 0 order by order_num;
+ select a.*, fn_get_fullname(a.code, 2) fullName
+ from lf.sys_dir a
+ where pid = 0
+ order by code;
</select>
<select id="selectProject" resultType="com.lf.server.entity.data.DirEntity">
select a.*, fn_get_fullname(a.code, 2) fullName
from lf.sys_dir a
<where>
- pid = 0
+ pid = 0 and id > 1
<if test="name != null">
and upper(name) like #{name}
</if>
</where>
- order by order_num;
+ order by code;
</select>
<select id="selectDirRecursive" resultType="com.lf.server.entity.data.DirEntity">
--
Gitblit v1.9.3