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 - - AND parent_id = #{parentId} - - - AND parent_id IS NULL - - - AND name ILIKE CONCAT('%', #{fileName}, '%') - + + + + AND name ILIKE CONCAT('%', #{fileName}, '%') + + + + + AND parent_id = #{parentId} + + + AND parent_id IS NULL + + + - 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} - 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 LIMIT #{limit} @@ -64,6 +70,9 @@ + + + + +