From e29ac67a9140d261a06b8d1febc4d5b054e56a51 Mon Sep 17 00:00:00 2001
From: wenjinbo <599483010@qq.com>
Date: Mon, 29 Sep 2025 09:35:03 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=9F=A5=E8=AF=86=E5=BA=93=E6=96=87?=
 =?UTF-8?q?=E6=A1=A3=E7=AE=A1=E7=90=86=E6=90=9C=E7=B4=A2=E6=9D=A1=E4=BB=B6?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../brichat/config/FeignConfiguration.java    |  4 +-
 .../mapper/opengauss/TDatasetFilesMapper.xml  | 41 ++++++++++++-------
 2 files changed, 28 insertions(+), 17 deletions(-)

diff --git a/chat-server/src/main/java/com/bjtds/brichat/config/FeignConfiguration.java b/chat-server/src/main/java/com/bjtds/brichat/config/FeignConfiguration.java
index 55bee2d..92d4c59 100644
--- a/chat-server/src/main/java/com/bjtds/brichat/config/FeignConfiguration.java
+++ b/chat-server/src/main/java/com/bjtds/brichat/config/FeignConfiguration.java
@@ -13,7 +13,7 @@ import java.util.HashSet;
 
 /**
  * fegin 配置文件
- * 
+ *
  *
  * 2019年3月29日
  */
@@ -62,7 +62,7 @@ public class FeignConfiguration extends FeignSudoUtil implements RequestIntercep
         if (!existHeaders.contains("__Permission__")) {
             template.header("__Permission__", "*:*:*");
         }
-         // } for ZB
+        // } for ZB
     }
 
 
diff --git a/chat-server/src/main/resources/com/bjtds/brichat/mapper/opengauss/TDatasetFilesMapper.xml b/chat-server/src/main/resources/com/bjtds/brichat/mapper/opengauss/TDatasetFilesMapper.xml
index 0661c87..1f8e0e0 100644
--- a/chat-server/src/main/resources/com/bjtds/brichat/mapper/opengauss/TDatasetFilesMapper.xml
+++ b/chat-server/src/main/resources/com/bjtds/brichat/mapper/opengauss/TDatasetFilesMapper.xml
@@ -37,24 +37,30 @@
         FROM t_dataset_files
         WHERE dify_dataset_id = #{difyDatasetId}
         AND is_deleted = false
-        <if test="parentId != null">
-            AND parent_id = #{parentId}
-        </if>
-        <if test="parentId == null">
-            AND parent_id IS NULL
-        </if>
-        <if test="fileName != null and fileName != ''">
-            AND name ILIKE CONCAT('%', #{fileName}, '%')
-        </if>
+        <choose>
+            <when test="fileName != null and fileName != ''">
+                <!-- 当 fileName 不为空时，忽略 parentId 条件 -->
+                AND name ILIKE CONCAT('%', #{fileName}, '%')
+            </when>
+            <otherwise>
+                <!-- 当 fileName 为空时，应用 parentId 条件 -->
+                <if test="parentId != null">
+                    AND parent_id = #{parentId}
+                </if>
+                <if test="parentId == null">
+                    AND parent_id IS NULL
+                </if>
+            </otherwise>
+        </choose>
         <if test="orderBy != null and orderBy != ''">
-            ORDER BY 
-                CASE WHEN type = 'folder' THEN 0 ELSE 1 END,
-                ${orderBy} ${orderDirection}
+            ORDER BY
+            CASE WHEN type = 'folder' THEN 0 ELSE 1 END,
+            ${orderBy} ${orderDirection}
         </if>
         <if test="orderBy == null or orderBy == ''">
-            ORDER BY 
-                CASE WHEN type = 'folder' THEN 0 ELSE 1 END,
-                name ASC
+            ORDER BY
+            CASE WHEN type = 'folder' THEN 0 ELSE 1 END,
+            name ASC
         </if>
         <if test="limit != null and limit > 0">
             LIMIT #{limit}
@@ -64,6 +70,9 @@
         </if>
     </select>
 
+
+
+
     <!-- 根据知识库id和parent_id 查询总数 -->
     <select id="countByDatasetIdAndParentId" resultType="int">
         SELECT COUNT(*)
@@ -81,6 +90,8 @@
         </if>
     </select>
 
+
+
     <!-- 根据知识库id和name查询 文件/文件夹 -->
     <select id="selectByDatasetIdAndName" resultMap="TDatasetFilesResultMap">
         SELECT <include refid="Base_Column_List"/>