From bfc1c1abd1d1deab45740806ce984b6774a319bd Mon Sep 17 00:00:00 2001
From: 13693261870 <252740454@qq.com>
Date: 星期一, 05 二月 2024 11:01:13 +0800
Subject: [PATCH] 修改目录编码过滤功能

---
 src/main/resources/mapper/all/BaseQueryMapper.xml |   25 +++++++++++++------------
 1 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/main/resources/mapper/all/BaseQueryMapper.xml b/src/main/resources/mapper/all/BaseQueryMapper.xml
index c1b9ef0..2e85d14 100644
--- a/src/main/resources/mapper/all/BaseQueryMapper.xml
+++ b/src/main/resources/mapper/all/BaseQueryMapper.xml
@@ -87,22 +87,23 @@
     </select>
 
     <select id="selectDirsByTypes" resultType="com.lf.server.entity.ctrl.KeyValueEntity">
-        select name "key", (select string_agg(code, ',') from lf.sys_dir where name = a.name) "value"
-        from lf.sys_dir a
-        <where>
-            1 = 1
-            <if test="types != null">
-                and name in
+        with rs as (
+            select name, code
+            from lf.sys_dir
+            <where>
+                name in
                 <foreach item="type" collection="types" open="(" separator="," close=")">
                     #{type}
                 </foreach>
-            </if>
-            <if test="dirs != null">
-                and ${dirs}
-            </if>
-        </where>
+                <if test="dirs != null">
+                    and ${dirs}
+                </if>
+            </where>
+        )
+        select name "key", (select string_agg(code, ',') from rs where name = a.name) "value"
+        from rs a
         group by name
-        order by key
+        order by value;
     </select>
 
     <select id="selectAnnexByTab" resultType="com.lf.server.entity.sys.AttachEntity">

--
Gitblit v1.9.3