Merge remote-tracking branch 'origin/master'

zhs

15 小时以前 babb070a354a8ecf1473ff882e0dc8735ab59912

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

@@ -79,7 +79,7 @@
        </if>
        <!-- 数据范围过滤 -->
        ${params.dataScope}
        order by d.parent_id, d.order_num
        order by d.dept_type asc, d.parent_id, d.order_num
    </select>

    <select id="selectDeptListByRoleId" resultType="Long">
@@ -107,7 +107,7 @@
               d.email,
               d.status,
               d.his_dept_id,
               d.his_parent_id
               d.his_parent_id,
               (select dept_name from sys_dept where dept_id = d.parent_id) parent_name
        from sys_dept d
        where d.dept_id = #{deptId}