jiangyc/RuoYi-Vue-Plus
1
0
Fork 0
mirror of https://github.com/dromara/RuoYi-Vue-Plus.git synced 2025-09-24 07:19:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

发布 v3.5.0-release 正式版

Browse Source
This commit is contained in:
疯狂的狮子li
2021-12-28 11:00:10 +08:00
parent 5857db7c5a
commit 55e3e93199
184 changed files with 3602 additions and 1516 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ruoyi/src/main/resources/mapper/system/SysDeptMapper.xml
View File

@ -42,17 +42,17 @@
<if test="status != null and status != ''">
AND status = #{status}
</if>
<!-- 数据范围过滤 -->
<if test="params.dataScope != null and params.dataScope != ''">
AND ( ${params.dataScope} )
</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>
<select id="selectDeptListByRoleId" resultType="Integer">
<select id="selectDeptListByRoleId" resultType="Long">
select d.dept_id
from sys_dept d
left join sys_role_dept rd on d.dept_id = rd.dept_id
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})

26
ruoyi/src/main/resources/mapper/system/SysMenuMapper.xml
View File

@ -27,33 +27,13 @@
<result property="remark" column="remark"/>
</resultMap>
<sql id="selectMenuVo">
select menu_id,
menu_name,
parent_id,
order_num,
path,
component,
query,
is_frame,
is_cache,
menu_type,
visible,
status,
ifnull(perms, '') as perms,
icon,
create_time
from sys_menu
</sql>
<select id="selectMenuTreeAll" resultMap="SysMenuResult">
select distinct m.menu_id,
m.parent_id,
m.menu_name,
m.path,
m.component,
m.query,
m.`query`,
m.visible,
m.status,
ifnull(m.perms, '') as perms,
@ -70,7 +50,7 @@
</select>
<select id="selectMenuListByUserId" parameterType="SysMenu" resultMap="SysMenuResult">
select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.query, m.visible, m.status,
select distinct m.menu_id, m.parent_id, m.menu_name, m.path, m.component, m.`query`, m.visible, m.status,
ifnull(m.perms,'') as perms, m.is_frame, m.is_cache, m.menu_type, m.icon, m.order_num, m.create_time
from sys_menu m
left join sys_role_menu rm on m.menu_id = rm.menu_id
@ -95,7 +75,7 @@
m.menu_name,
m.path,
m.component,
m.query,
m.`query`,
m.visible,
m.status,
ifnull(m.perms, '') as perms,

4
ruoyi/src/main/resources/mapper/system/SysPostMapper.xml
View File

@ -29,7 +29,7 @@
from sys_post
</sql>
<select id="selectPostListByUserId" parameterType="Long" resultType="Integer">
<select id="selectPostListByUserId" parameterType="Long" resultType="Long">
select p.post_id
from sys_post p
left join sys_user_post up on up.post_id = p.post_id
@ -45,4 +45,4 @@
where u.user_name = #{userName}
</select>
</mapper>
</mapper>

16
ruoyi/src/main/resources/mapper/system/SysRoleMapper.xml
View File

@ -60,10 +60,10 @@
<if test="role.params.endTime != null and role.params.endTime != ''"><!-- 结束时间检索 -->
and date_format(r.create_time,'%y%m%d') &lt;= date_format(#{role.params.endTime},'%y%m%d')
</if>
<!-- 数据范围过滤 -->
<if test="role.params.dataScope != null and role.params.dataScope != ''">
AND ( ${role.params.dataScope} )
</if>
<!-- &lt;!&ndash; 数据范围过滤 &ndash;&gt;-->
<!-- <if test="role.params.dataScope != null and role.params.dataScope != ''">-->
<!-- AND ( ${role.params.dataScope} )-->
<!-- </if>-->
order by r.role_sort
</select>
@ -88,10 +88,10 @@
<if test="params.endTime != null and params.endTime != ''"><!-- 结束时间检索 -->
and date_format(r.create_time,'%y%m%d') &lt;= date_format(#{params.endTime},'%y%m%d')
</if>
<!-- 数据范围过滤 -->
<if test="params.dataScope != null and params.dataScope != ''">
AND ( ${params.dataScope} )
</if>
<!-- &lt;!&ndash; 数据范围过滤 &ndash;&gt;-->
<!-- <if test="params.dataScope != null and params.dataScope != ''">-->
<!-- AND ( ${params.dataScope} )-->
<!-- </if>-->
order by r.role_sort
</select>

16
ruoyi/src/main/resources/mapper/system/SysUserMapper.xml
View File

@ -108,10 +108,10 @@
AND (u.dept_id = #{user.deptId} OR u.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE find_in_set(#{user.deptId},
ancestors) ))
</if>
<!-- 数据范围过滤 -->
<if test="user.params.dataScope != null and user.params.dataScope != ''">
AND ( ${user.params.dataScope} )
</if>
<!-- &lt;!&ndash; 数据范围过滤 &ndash;&gt;-->
<!-- <if test="user.params.dataScope != null and user.params.dataScope != ''">-->
<!-- AND ( ${user.params.dataScope} )-->
<!-- </if>-->
</select>
<select id="selectUserList" parameterType="SysUser" resultMap="SysUserResult">
@ -142,10 +142,10 @@
AND (u.dept_id = #{deptId} OR u.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE find_in_set(#{deptId},
ancestors) ))
</if>
<!-- 数据范围过滤 -->
<if test="params.dataScope != null and params.dataScope != ''">
AND ( ${params.dataScope} )
</if>
<!-- &lt;!&ndash; 数据范围过滤 &ndash;&gt;-->
<!-- <if test="params.dataScope != null and params.dataScope != ''">-->
<!-- AND ( ${params.dataScope} )-->
<!-- </if>-->
</select>
<select id="selectAllocatedList" parameterType="SysUser" resultMap="SysUserResult">