
Conflicts: ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictTypeController.java ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictDataService.java ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictDataServiceImpl.java ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml ruoyi-ui/src/api/system/config.js ruoyi-ui/src/api/system/dict/type.js ruoyi-ui/src/views/system/config/index.vue ruoyi-ui/src/views/system/dict/index.vue
59 lines
2.4 KiB
XML
59 lines
2.4 KiB
XML
<?xml version="1.0" encoding="UTF-8" ?>
|
|
<!DOCTYPE mapper
|
|
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
|
|
<mapper namespace="com.ruoyi.system.mapper.SysDeptMapper">
|
|
|
|
<resultMap type="SysDept" id="SysDeptResult">
|
|
<id property="deptId" column="dept_id"/>
|
|
<result property="parentId" column="parent_id"/>
|
|
<result property="ancestors" column="ancestors"/>
|
|
<result property="deptName" column="dept_name"/>
|
|
<result property="orderNum" column="order_num"/>
|
|
<result property="leader" column="leader"/>
|
|
<result property="phone" column="phone"/>
|
|
<result property="email" column="email"/>
|
|
<result property="status" column="status"/>
|
|
<result property="delFlag" column="del_flag"/>
|
|
<result property="parentName" column="parent_name"/>
|
|
<result property="createBy" column="create_by"/>
|
|
<result property="createTime" column="create_time"/>
|
|
<result property="updateBy" column="update_by"/>
|
|
<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
|
|
left join sys_role_dept rd on d.dept_id = rd.dept_id
|
|
where rd.role_id = #{roleId}
|
|
<if test="deptCheckStrictly">
|
|
and d.dept_id not in (select d.parent_id from sys_dept d inner join sys_role_dept rd on d.dept_id = rd.dept_id and rd.role_id = #{roleId})
|
|
</if>
|
|
order by d.parent_id, d.order_num
|
|
</select>
|
|
|
|
</mapper>
|