:zap: 修复部分sql未加is_deleted筛选

src/main/java/org/springblade/modules/system/mapper/DictMapper.xml

@@ -35,18 +35,18 @@
     <select id="getValue" resultType="java.lang.String">
         select
             dict_value
-        from blade_dict where code = #{param1} and dict_key = #{param2} limit 1
+        from blade_dict where code = #{param1} and dict_key = #{param2} and is_deleted = 0 limit 1
     </select>
 
     <!-- oracle 版本 -->
     <!--<select id="getValue" resultType="java.lang.String">
         select
             dict_value
-        from blade_dict where code = #{param1, jdbcType=VARCHAR} and dict_key = #{param2} rownum 1
+        from blade_dict where code = #{param1, jdbcType=VARCHAR} and dict_key = #{param2} and dict_key >= 0  rownum 1
     </select>-->
 
     <select id="getList" resultMap="dictResultMap">
-        select code, dict_key, dict_value, sort, remark from blade_dict where code = #{param1}
+        select code, dict_key, dict_value, sort, remark from blade_dict where code = #{param1} and dict_key >= 0  and is_deleted = 0
     </select>
 
     <select id="tree" resultMap="treeNodeResultMap">

src/main/java/org/springblade/modules/system/mapper/MenuMapper.xml

@@ -46,7 +46,7 @@
     </select>
 
     <select id="roleMenu" resultMap="menuResultMap">
-        select * from blade_menu where is_deleted = 0 AND id IN ( SELECT menu_id FROM blade_role_menu WHERE role_id IN
+        select * from blade_menu where is_deleted = 0 and id IN ( SELECT menu_id FROM blade_role_menu WHERE role_id IN
         <foreach collection="list" index="index" item="item" open="(" separator="," close=")">
             #{item}
         </foreach> )
@@ -58,8 +58,8 @@
         FROM
             blade_menu
         WHERE
-            category = 1
-            AND id IN ( SELECT menu_id FROM blade_role_menu WHERE role_id IN
+            is_deleted = 0 and category = 1
+            and id IN ( SELECT menu_id FROM blade_role_menu WHERE role_id IN
                         <foreach collection="list" index="index" item="item" open="(" separator="," close=")">
                             #{item}
                         </foreach> )
@@ -79,7 +79,7 @@
         FROM
             blade_menu
         WHERE
-            id IN (
+            is_deleted = 0 and id IN (
               SELECT parent_id FROM blade_menu
               WHERE ( category = 2 AND id IN ( SELECT menu_id FROM blade_role_menu WHERE role_id IN
                 <foreach collection="list" index="index" item="item" open="(" separator="," close=")">
@@ -102,10 +102,10 @@
         FROM
             blade_menu
         WHERE
-            ( category = 2 AND id IN ( SELECT menu_id FROM blade_role_menu WHERE role_id IN
+            is_deleted = 0 and  category = 2 AND id IN ( SELECT menu_id FROM blade_role_menu WHERE role_id IN
             <foreach collection="list" index="index" item="item" open="(" separator="," close=")">
                 #{item}
-            </foreach>) )
+            </foreach>)
     </select>
 
     <select id="grantTree" resultMap="treeNodeResultMap">
@@ -140,7 +140,7 @@
             <foreach collection="list" index="index" item="item" open="(" separator="," close=")">
                 #{item}
             </foreach>
-            AND m.path IS NOT NULL
+            AND m.path IS NOT NULL and m.is_deleted = 0
         GROUP BY m.path
     </select>
 

src/main/java/org/springblade/modules/system/mapper/UserMapper.xml

@@ -59,6 +59,7 @@
         <foreach collection="array" item="ids" index="index" open="(" close=")" separator=",">
             #{ids}
         </foreach>
+        and is_deleted = 0
     </select>
 
     <select id="getRoleAlias" resultType="java.lang.String">
@@ -71,6 +72,7 @@
         <foreach collection="array" item="ids" index="index" open="(" close=")" separator=",">
             #{ids}
         </foreach>
+        and is_deleted = 0
     </select>
 
     <select id="getDeptName" resultType="java.lang.String">
@@ -83,6 +85,7 @@
         <foreach collection="array" item="ids" index="index" open="(" close=")" separator=",">
             #{ids}
         </foreach>
+        and is_deleted = 0
     </select>
 
 </mapper>