From e04a3c583860636f8e38f4f61dfee635a0707d4d Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Wed, 24 Jan 2024 17:05:20 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=A7=BB=E5=8A=A8=E7=AB=AF=E4=BB=AA?=
 =?UTF-8?q?=E8=A1=A8=E6=9D=BF=E6=8E=92=E5=BA=8F=E5=92=8Cpc=E7=AB=AF?=
 =?UTF-8?q?=E4=B8=8D=E4=B8=80=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/io/dataease/ext/MobileDirMapper.xml  | 77 +++++++++----------
 1 file changed, 35 insertions(+), 42 deletions(-)

diff --git a/core/backend/src/main/java/io/dataease/ext/MobileDirMapper.xml b/core/backend/src/main/java/io/dataease/ext/MobileDirMapper.xml
index f9e61ff465..5351063b1d 100644
--- a/core/backend/src/main/java/io/dataease/ext/MobileDirMapper.xml
+++ b/core/backend/src/main/java/io/dataease/ext/MobileDirMapper.xml
@@ -3,17 +3,15 @@
 <mapper namespace="io.dataease.ext.MobileDirMapper">
 
     <select id="query" resultType="io.dataease.mobile.entity.PanelEntity">
-       SELECT
-            id,
-            NAME AS text,
-            pid,
-            node_type AS `type`
-        FROM
-            panel_group g,
-            ( SELECT GET_V_AUTH_MODEL_ID_P_USE_MOBILE ( #{userId}, 'panel' ) cids ) t
-        WHERE
-            g.pid =  #{pid}
-            AND FIND_IN_SET( g.id, cids  )
+        SELECT id,
+               NAME      AS text,
+               pid,
+               node_type AS `type`
+        FROM panel_group g,
+             (SELECT GET_V_AUTH_MODEL_ID_P_USE_MOBILE(#{userId}, 'panel') cids) t
+        WHERE g.pid = #{pid}
+          AND FIND_IN_SET(g.id, cids)
+        ORDER BY g.panel_sort desc, CONVERT(g.name using gbk)
     </select>
 
     <select id="queryWithName" resultType="io.dataease.mobile.entity.PanelEntity">
@@ -26,35 +24,34 @@
         panel_group g,
         ( SELECT GET_V_AUTH_MODEL_ID_P_USE_MOBILE ( #{userId}, 'panel' ) cids ) t
         WHERE
-         FIND_IN_SET( g.id, cids  )
-       <if test="name != null">
-           and name like CONCAT('%', #{name, jdbcType=VARCHAR}, '%')
-       </if>
+        FIND_IN_SET( g.id, cids )
+        <if test="name != null">
+            and name like CONCAT('%', #{name, jdbcType=VARCHAR}, '%')
+        </if>
+        ORDER BY g.panel_sort desc, CONVERT(g.name using gbk)
     </select>
 
 
     <select id="idsWithUser" resultType="java.lang.String">
         select a.auth_source
         from sys_auth a
-        left join sys_auth_detail d on a.id = d.auth_id
-        where
-            a.auth_target_type = 'user' and
-            a.auth_target = #{userId} and
-            a.auth_source_type = 'panel' and
-            d.privilege_type = 1 and
-            d.privilege_value = 1
+                 left join sys_auth_detail d on a.id = d.auth_id
+        where a.auth_target_type = 'user'
+          and a.auth_target = #{userId}
+          and a.auth_source_type = 'panel'
+          and d.privilege_type = 1
+          and d.privilege_value = 1
     </select>
 
     <select id="idsWithDept" resultType="java.lang.String">
         select a.auth_source
         from sys_auth a
-        left join sys_auth_detail d on a.id = d.auth_id
-        where
-            a.auth_target_type = 'dept' and
-            a.auth_target = #{deptId} and
-            a.auth_source_type = 'panel' and
-            d.privilege_type = 1 and
-            d.privilege_value = 1
+                 left join sys_auth_detail d on a.id = d.auth_id
+        where a.auth_target_type = 'dept'
+          and a.auth_target = #{deptId}
+          and a.auth_source_type = 'panel'
+          and d.privilege_type = 1
+          and d.privilege_value = 1
     </select>
 
     <select id="idsWithRoles" resultType="java.lang.String">
@@ -62,20 +59,16 @@
         from sys_auth a
         left join sys_auth_detail d on a.id = d.auth_id
         where
-            a.auth_target_type = 'role' and
-            a.auth_target in
-            <foreach collection="roleIds" item="roleId" open='(' separator=',' close=')'>
-                #{roleId}
-            </foreach>
-            and
-            a.auth_source_type = 'panel' and
-            d.privilege_type = 1 and
-            d.privilege_value = 1
+        a.auth_target_type = 'role' and
+        a.auth_target in
+        <foreach collection="roleIds" item="roleId" open='(' separator=',' close=')'>
+            #{roleId}
+        </foreach>
+        and
+        a.auth_source_type = 'panel' and
+        d.privilege_type = 1 and
+        d.privilege_value = 1
     </select>
 
 
-
-
-
-
 </mapper>