Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
前端资源
RuoYi-Vue
提交
836017f2
R
RuoYi-Vue
项目概览
前端资源
/
RuoYi-Vue
12 个月 前同步成功
通知
5
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
RuoYi-Vue
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
836017f2
编写于
12月 06, 2021
作者:
若
若依
提交者:
Gitee
12月 06, 2021
浏览文件
操作
浏览文件
下载
差异文件
!381 fix 修复主键溢出问题 将查询返回类型改为 Long
Merge pull request !381 from 疯狂的狮子Li/fix
上级
2c3f1c28
965ebd0f
变更
12
隐藏空白更改
内联
并排
Showing
12 changed file
with
12 addition
and
12 deletion
+12
-12
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java
.../src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java
+1
-1
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java
.../src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java
+1
-1
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysPostMapper.java
.../src/main/java/com/ruoyi/system/mapper/SysPostMapper.java
+1
-1
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java
...c/main/java/com/ruoyi/system/service/ISysDeptService.java
+1
-1
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java
...c/main/java/com/ruoyi/system/service/ISysMenuService.java
+1
-1
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.java
...c/main/java/com/ruoyi/system/service/ISysPostService.java
+1
-1
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
...ava/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
+1
-1
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
...ava/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
+1
-1
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java
...ava/com/ruoyi/system/service/impl/SysPostServiceImpl.java
+1
-1
ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
...system/src/main/resources/mapper/system/SysDeptMapper.xml
+1
-1
ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
...system/src/main/resources/mapper/system/SysMenuMapper.xml
+1
-1
ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml
...system/src/main/resources/mapper/system/SysPostMapper.xml
+1
-1
未找到文件。
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDeptMapper.java
浏览文件 @
836017f2
...
...
@@ -26,7 +26,7 @@ public interface SysDeptMapper
* @param deptCheckStrictly 部门树选择项是否关联显示
* @return 选中部门列表
*/
public
List
<
Integer
>
selectDeptListByRoleId
(
@Param
(
"roleId"
)
Long
roleId
,
@Param
(
"deptCheckStrictly"
)
boolean
deptCheckStrictly
);
public
List
<
Long
>
selectDeptListByRoleId
(
@Param
(
"roleId"
)
Long
roleId
,
@Param
(
"deptCheckStrictly"
)
boolean
deptCheckStrictly
);
/**
* 根据部门ID查询信息
...
...
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysMenuMapper.java
浏览文件 @
836017f2
...
...
@@ -64,7 +64,7 @@ public interface SysMenuMapper
* @param menuCheckStrictly 菜单树选择项是否关联显示
* @return 选中菜单列表
*/
public
List
<
Integer
>
selectMenuListByRoleId
(
@Param
(
"roleId"
)
Long
roleId
,
@Param
(
"menuCheckStrictly"
)
boolean
menuCheckStrictly
);
public
List
<
Long
>
selectMenuListByRoleId
(
@Param
(
"roleId"
)
Long
roleId
,
@Param
(
"menuCheckStrictly"
)
boolean
menuCheckStrictly
);
/**
* 根据菜单ID查询信息
...
...
ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysPostMapper.java
浏览文件 @
836017f2
...
...
@@ -39,7 +39,7 @@ public interface SysPostMapper
* @param userId 用户ID
* @return 选中岗位ID列表
*/
public
List
<
Integer
>
selectPostListByUserId
(
Long
userId
);
public
List
<
Long
>
selectPostListByUserId
(
Long
userId
);
/**
* 查询用户所属岗位组
...
...
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDeptService.java
浏览文件 @
836017f2
...
...
@@ -41,7 +41,7 @@ public interface ISysDeptService
* @param roleId 角色ID
* @return 选中部门列表
*/
public
List
<
Integer
>
selectDeptListByRoleId
(
Long
roleId
);
public
List
<
Long
>
selectDeptListByRoleId
(
Long
roleId
);
/**
* 根据部门ID查询信息
...
...
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysMenuService.java
浏览文件 @
836017f2
...
...
@@ -52,7 +52,7 @@ public interface ISysMenuService
* @param roleId 角色ID
* @return 选中菜单列表
*/
public
List
<
Integer
>
selectMenuListByRoleId
(
Long
roleId
);
public
List
<
Long
>
selectMenuListByRoleId
(
Long
roleId
);
/**
* 构建前端路由所需要的菜单
...
...
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.java
浏览文件 @
836017f2
...
...
@@ -39,7 +39,7 @@ public interface ISysPostService
* @param userId 用户ID
* @return 选中岗位ID列表
*/
public
List
<
Integer
>
selectPostListByUserId
(
Long
userId
);
public
List
<
Long
>
selectPostListByUserId
(
Long
userId
);
/**
* 校验岗位名称
...
...
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java
浏览文件 @
836017f2
...
...
@@ -100,7 +100,7 @@ public class SysDeptServiceImpl implements ISysDeptService
* @return 选中部门列表
*/
@Override
public
List
<
Integer
>
selectDeptListByRoleId
(
Long
roleId
)
public
List
<
Long
>
selectDeptListByRoleId
(
Long
roleId
)
{
SysRole
role
=
roleMapper
.
selectRoleById
(
roleId
);
return
deptMapper
.
selectDeptListByRoleId
(
roleId
,
role
.
isDeptCheckStrictly
());
...
...
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysMenuServiceImpl.java
浏览文件 @
836017f2
...
...
@@ -128,7 +128,7 @@ public class SysMenuServiceImpl implements ISysMenuService
* @return 选中菜单列表
*/
@Override
public
List
<
Integer
>
selectMenuListByRoleId
(
Long
roleId
)
public
List
<
Long
>
selectMenuListByRoleId
(
Long
roleId
)
{
SysRole
role
=
roleMapper
.
selectRoleById
(
roleId
);
return
menuMapper
.
selectMenuListByRoleId
(
roleId
,
role
.
isMenuCheckStrictly
());
...
...
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java
浏览文件 @
836017f2
...
...
@@ -67,7 +67,7 @@ public class SysPostServiceImpl implements ISysPostService
* @return 选中岗位ID列表
*/
@Override
public
List
<
Integer
>
selectPostListByUserId
(
Long
userId
)
public
List
<
Long
>
selectPostListByUserId
(
Long
userId
)
{
return
postMapper
.
selectPostListByUserId
(
userId
);
}
...
...
ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml
浏览文件 @
836017f2
...
...
@@ -47,7 +47,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
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
...
...
ruoyi-system/src/main/resources/mapper/system/SysMenuMapper.xml
浏览文件 @
836017f2
...
...
@@ -84,7 +84,7 @@
order by m.parent_id, m.order_num
</select>
<select
id=
"selectMenuListByRoleId"
resultType=
"
Integer
"
>
<select
id=
"selectMenuListByRoleId"
resultType=
"
Long
"
>
select m.menu_id
from sys_menu m
left join sys_role_menu rm on m.menu_id = rm.menu_id
...
...
ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml
浏览文件 @
836017f2
...
...
@@ -46,7 +46,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where post_id = #{postId}
</select>
<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
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录