!6 同步develop分支

* sync -- 同步develop分支

ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml

@@ -30,9 +30,9 @@
     <select id="selectDeptList" parameterType="SysDept" resultMap="SysDeptResult">
         <include refid="selectDeptVo"/>
         where d.del_flag = '0'
-		<if test="deptId != null and deptId != 0">
-			AND dept_id = #{deptId}
-		</if>
+        <if test="deptId != null and deptId != 0">
+            AND dept_id = #{deptId}
+        </if>
         <if test="parentId != null and parentId != 0">
             AND parent_id = #{parentId}
         </if>
@@ -42,10 +42,6 @@
         <if test="status != null and status != ''">
             AND status = #{status}
         </if>
-<!--        &lt;!&ndash; 数据范围过滤 &ndash;&gt;-->
-<!--        <if test="params.dataScope != null and params.dataScope != ''">-->
-<!--            AND ( ${params.dataScope} )-->
-<!--        </if>-->
         order by d.parent_id, d.order_num
     </select>