From 499209d5f277301b2bc7b2a5ad74c64a7b789e52 Mon Sep 17 00:00:00 2001 From: smallchill Date: Fri, 29 Mar 2019 16:41:47 +0800 Subject: [PATCH] =?UTF-8?q?:tada:=20=E4=BF=AE=E5=A4=8D=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E9=83=A8=E5=88=86bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/springblade/system/mapper/MenuMapper.java | 2 ++ .../org/springblade/system/mapper/RoleMapper.java | 3 ++- .../org/springblade/system/mapper/RoleMapper.xml | 7 +++++-- .../system/service/impl/RoleServiceImpl.java | 11 ++++++++++- .../system/user/controller/UserController.java | 6 +----- .../springblade/system/user/mapper/UserMapper.xml | 2 +- .../system/user/service/IUserService.java | 7 +++++++ .../system/user/service/impl/UserServiceImpl.java | 13 +++++++++++++ 8 files changed, 41 insertions(+), 10 deletions(-) diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/MenuMapper.java b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/MenuMapper.java index 8104f9a6..04c32f1d 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/MenuMapper.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/MenuMapper.java @@ -56,6 +56,7 @@ public interface MenuMapper extends BaseMapper { /** * 授权树形结构 * + * @param roleId * @return */ List grantTreeByRole(List roleId); @@ -93,6 +94,7 @@ public interface MenuMapper extends BaseMapper { /** * 获取配置的角色权限 + * * @param roleIds * @return */ diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/RoleMapper.java b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/RoleMapper.java index 0d10925a..02cdc4b2 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/RoleMapper.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/RoleMapper.java @@ -42,8 +42,9 @@ public interface RoleMapper extends BaseMapper { * 获取树形节点 * * @param tenantCode + * @param excludeRole * @return */ - List tree(String tenantCode); + List tree(String tenantCode, String excludeRole); } diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/RoleMapper.xml b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/RoleMapper.xml index 241102c8..2a497cbb 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/mapper/RoleMapper.xml +++ b/blade-service/blade-system/src/main/java/org/springblade/system/mapper/RoleMapper.xml @@ -32,8 +32,11 @@ diff --git a/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/RoleServiceImpl.java b/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/RoleServiceImpl.java index bb0c1d12..11d7c4fb 100644 --- a/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/RoleServiceImpl.java +++ b/blade-service/blade-system/src/main/java/org/springblade/system/service/impl/RoleServiceImpl.java @@ -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 implements IR @Override public List 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 diff --git a/blade-service/blade-user/src/main/java/org/springblade/system/user/controller/UserController.java b/blade-service/blade-user/src/main/java/org/springblade/system/user/controller/UserController.java index d36fbaf3..fa01d56a 100644 --- a/blade-service/blade-user/src/main/java/org/springblade/system/user/controller/UserController.java +++ b/blade-service/blade-user/src/main/java/org/springblade/system/user/controller/UserController.java @@ -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)); } /** diff --git a/blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.xml b/blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.xml index c4eada6f..e7408b7c 100644 --- a/blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.xml +++ b/blade-service/blade-user/src/main/java/org/springblade/system/user/mapper/UserMapper.xml @@ -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