From 69d6c0342055ccf937ec73f7271a960c43c1347f Mon Sep 17 00:00:00 2001
From: FatttSnake <fatttsnake@gmail.com>
Date: Wed, 17 May 2023 15:09:51 +0800
Subject: [PATCH] Optimized role sql query statement

---
 Pinnacle/src/main/resources/mapper/RoleMapper.xml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/Pinnacle/src/main/resources/mapper/RoleMapper.xml b/Pinnacle/src/main/resources/mapper/RoleMapper.xml
index b1545b4..5c3d8b3 100644
--- a/Pinnacle/src/main/resources/mapper/RoleMapper.xml
+++ b/Pinnacle/src/main/resources/mapper/RoleMapper.xml
@@ -23,13 +23,12 @@
                t.element_id   as operation_element_id,
                t.parent_id    as operation_parent_id
         from t_role
-                 left join t_power_role tpr on t_role.id = tpr.role_id
+                 left join (select * from t_power_role where deleted = 0) as tpr on t_role.id = tpr.role_id
                  left join t_power tp on tp.id = tpr.power_id
                  left join t_menu tm on tp.id = tm.power_id
                  left join t_element te on tp.id = te.power_id
                  left join t_operation t on tp.id = t.power_id
         where t_role.deleted = 0
-          and (tpr.deleted = 0 or tpr.deleted is null);
     </select>
     <select id="getOneById" resultMap="roleMap">
         select t_role.id      as role_id,
@@ -52,13 +51,12 @@
                t.element_id   as operation_element_id,
                t.parent_id    as operation_parent_id
         from t_role
-                 left join t_power_role tpr on t_role.id = tpr.role_id
+                 left join (select * from t_power_role where deleted = 0) as tpr on t_role.id = tpr.role_id
                  left join t_power tp on tp.id = tpr.power_id
                  left join t_menu tm on tp.id = tm.power_id
                  left join t_element te on tp.id = te.power_id
                  left join t_operation t on tp.id = t.power_id
         where t_role.deleted = 0
-          and (tpr.deleted = 0 or tpr.deleted is null)
           and t_role.id = #{id};
     </select>