From d50e7a3d178a7f05852207d4525b258c826117ac Mon Sep 17 00:00:00 2001 From: 疯狂的狮子li <15040126243@163.com> Date: 星期六, 08 五月 2021 23:39:50 +0800 Subject: [PATCH] !30 同步dev分支 Merge pull request !30 from 疯狂的狮子li/dev --- ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml | 22 ++++++++++++++++++++++ 1 files changed, 22 insertions(+), 0 deletions(-) diff --git a/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml index 07fc5d6..0f99671 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml @@ -22,6 +22,28 @@ <result property="updateTime" column="update_time"/> </resultMap> + <sql id="selectDeptVo"> + select d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.phone, d.email, d.status, d.del_flag, d.create_by, d.create_time + from sys_dept d + </sql> + + <select id="selectDeptList" parameterType="SysDept" resultMap="SysDeptResult"> + <include refid="selectDeptVo"/> + where d.del_flag = '0' + <if test="parentId != null and parentId != 0"> + AND parent_id = #{parentId} + </if> + <if test="deptName != null and deptName != ''"> + AND dept_name like concat('%', #{deptName}, '%') + </if> + <if test="status != null and status != ''"> + AND status = #{status} + </if> + <!-- 鏁版嵁鑼冨洿杩囨护 --> + ${params.dataScope} + order by d.parent_id, d.order_num + </select> + <select id="selectDeptListByRoleId" resultType="Integer"> select d.dept_id from sys_dept d -- Gitblit v1.9.3