Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
int
SpringBlade
提交
499209d5
S
SpringBlade
项目概览
int
/
SpringBlade
10 个月 前同步成功
通知
16
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
S
SpringBlade
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
499209d5
编写于
3月 29, 2019
作者:
S
smallchill
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
🎉
修复系统管理部分bug
上级
cdabf8cd
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
41 addition
and
10 deletion
+41
-10
blade-service/blade-system/src/main/java/org/springblade/system/mapper/MenuMapper.java
...c/main/java/org/springblade/system/mapper/MenuMapper.java
+2
-0
blade-service/blade-system/src/main/java/org/springblade/system/mapper/RoleMapper.java
...c/main/java/org/springblade/system/mapper/RoleMapper.java
+2
-1
blade-service/blade-system/src/main/java/org/springblade/system/mapper/RoleMapper.xml
...rc/main/java/org/springblade/system/mapper/RoleMapper.xml
+5
-2
blade-service/blade-system/src/main/java/org/springblade/system/service/impl/RoleServiceImpl.java
.../org/springblade/system/service/impl/RoleServiceImpl.java
+10
-1
blade-service/blade-user/src/main/java/org/springblade/system/user/controller/UserController.java
...rg/springblade/system/user/controller/UserController.java
+1
-5
blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.xml
...in/java/org/springblade/system/user/mapper/UserMapper.xml
+1
-1
blade-service/blade-user/src/main/java/org/springblade/system/user/service/IUserService.java
...ava/org/springblade/system/user/service/IUserService.java
+7
-0
blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java
...springblade/system/user/service/impl/UserServiceImpl.java
+13
-0
未找到文件。
blade-service/blade-system/src/main/java/org/springblade/system/mapper/MenuMapper.java
浏览文件 @
499209d5
...
...
@@ -56,6 +56,7 @@ public interface MenuMapper extends BaseMapper<Menu> {
/**
* 授权树形结构
*
* @param roleId
* @return
*/
List
<
MenuVO
>
grantTreeByRole
(
List
<
Integer
>
roleId
);
...
...
@@ -93,6 +94,7 @@ public interface MenuMapper extends BaseMapper<Menu> {
/**
* 获取配置的角色权限
*
* @param roleIds
* @return
*/
...
...
blade-service/blade-system/src/main/java/org/springblade/system/mapper/RoleMapper.java
浏览文件 @
499209d5
...
...
@@ -42,8 +42,9 @@ public interface RoleMapper extends BaseMapper<Role> {
* 获取树形节点
*
* @param tenantCode
* @param excludeRole
* @return
*/
List
<
RoleVO
>
tree
(
String
tenantCode
);
List
<
RoleVO
>
tree
(
String
tenantCode
,
String
excludeRole
);
}
blade-service/blade-system/src/main/java/org/springblade/system/mapper/RoleMapper.xml
浏览文件 @
499209d5
...
...
@@ -32,8 +32,11 @@
<select
id=
"tree"
resultMap=
"treeNodeResultMap"
>
select id, parent_id, role_name as title, id as 'value', id as 'key' from blade_role where is_deleted = 0
<if
test=
"_parameter!=null"
>
and tenant_code = #{_parameter}
<if
test=
"param1!=null"
>
and tenant_code = #{param1}
</if>
<if
test=
"param2!=null"
>
and role_alias
<>
#{param2}
</if>
</select>
...
...
blade-service/blade-system/src/main/java/org/springblade/system/service/impl/RoleServiceImpl.java
浏览文件 @
499209d5
...
...
@@ -19,7 +19,11 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import
com.baomidou.mybatisplus.core.toolkit.Wrappers
;
import
com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
;
import
lombok.AllArgsConstructor
;
import
org.springblade.core.secure.utils.SecureUtil
;
import
org.springblade.core.tool.constant.RoleConstant
;
import
org.springblade.core.tool.node.ForestNodeMerger
;
import
org.springblade.core.tool.utils.CollectionUtil
;
import
org.springblade.core.tool.utils.Func
;
import
org.springblade.system.entity.Role
;
import
org.springblade.system.entity.RoleMenu
;
import
org.springblade.system.mapper.RoleMapper
;
...
...
@@ -52,7 +56,12 @@ public class RoleServiceImpl extends ServiceImpl<RoleMapper, Role> implements IR
@Override
public
List
<
RoleVO
>
tree
(
String
tenantCode
)
{
return
ForestNodeMerger
.
merge
(
baseMapper
.
tree
(
tenantCode
));
String
userRole
=
SecureUtil
.
getUserRole
();
String
excludeRole
=
null
;
if
(!
CollectionUtil
.
contains
(
Func
.
toStrArray
(
userRole
),
RoleConstant
.
ADMIN
))
{
excludeRole
=
RoleConstant
.
ADMIN
;
}
return
ForestNodeMerger
.
merge
(
baseMapper
.
tree
(
tenantCode
,
excludeRole
));
}
@Override
...
...
blade-service/blade-user/src/main/java/org/springblade/system/user/controller/UserController.java
浏览文件 @
499209d5
...
...
@@ -28,7 +28,6 @@ import org.springblade.core.mp.support.Query;
import
org.springblade.core.secure.BladeUser
;
import
org.springblade.core.tool.api.R
;
import
org.springblade.core.tool.constant.BladeConstant
;
import
org.springblade.core.tool.utils.DigestUtil
;
import
org.springblade.core.tool.utils.Func
;
import
org.springblade.system.feign.IDictClient
;
import
org.springblade.system.user.entity.User
;
...
...
@@ -88,10 +87,7 @@ public class UserController {
@PostMapping
(
"/submit"
)
@ApiOperation
(
value
=
"新增或修改"
,
notes
=
"传入User"
,
position
=
3
)
public
R
submit
(
@Valid
@RequestBody
User
user
)
{
if
(
Func
.
isNotEmpty
(
user
.
getPassword
()))
{
user
.
setPassword
(
DigestUtil
.
encrypt
(
user
.
getPassword
()));
}
return
R
.
status
(
userService
.
saveOrUpdate
(
user
));
return
R
.
status
(
userService
.
submit
(
user
));
}
/**
...
...
blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.xml
浏览文件 @
499209d5
...
...
@@ -46,7 +46,7 @@
FROM
blade_user
WHERE
tenant_code = #{param1} and account = #{param2}
AND password = #{param3}
tenant_code = #{param1} and account = #{param2}
and password = #{param3} and is_deleted = 0
</select>
<select
id=
"getRoleName"
resultType=
"java.lang.String"
>
...
...
blade-service/blade-user/src/main/java/org/springblade/system/user/service/IUserService.java
浏览文件 @
499209d5
...
...
@@ -30,6 +30,13 @@ import java.util.List;
*/
public
interface
IUserService
extends
BaseService
<
User
>
{
/**
* 新增或修改用户
* @param user
* @return
*/
boolean
submit
(
User
user
);
/**
* 自定义分页
*
...
...
blade-service/blade-user/src/main/java/org/springblade/system/user/service/impl/UserServiceImpl.java
浏览文件 @
499209d5
...
...
@@ -18,6 +18,7 @@ package org.springblade.system.user.service.impl;
import
com.baomidou.mybatisplus.core.metadata.IPage
;
import
com.baomidou.mybatisplus.core.toolkit.Wrappers
;
import
com.baomidou.mybatisplus.extension.exceptions.ApiException
;
import
org.springblade.common.constant.CommonConstant
;
import
org.springblade.core.mp.base.BaseServiceImpl
;
import
org.springblade.core.tool.utils.DigestUtil
;
...
...
@@ -39,6 +40,18 @@ import java.util.List;
@Service
public
class
UserServiceImpl
extends
BaseServiceImpl
<
UserMapper
,
User
>
implements
IUserService
{
@Override
public
boolean
submit
(
User
user
)
{
if
(
Func
.
isNotEmpty
(
user
.
getPassword
()))
{
user
.
setPassword
(
DigestUtil
.
encrypt
(
user
.
getPassword
()));
}
Integer
cnt
=
baseMapper
.
selectCount
(
Wrappers
.<
User
>
query
().
lambda
().
eq
(
User:
:
getTenantCode
,
user
.
getTenantCode
()).
eq
(
User:
:
getAccount
,
user
.
getAccount
()));
if
(
cnt
>
0
)
{
throw
new
ApiException
(
"当前用户已存在!"
);
}
return
saveOrUpdate
(
user
);
}
@Override
public
IPage
<
User
>
selectUserPage
(
IPage
<
User
>
page
,
User
user
)
{
return
page
.
setRecords
(
baseMapper
.
selectUserPage
(
page
,
user
));
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录