From 246dc1aecc8e813d49ed04ad4e5fe02bcefda1e1 Mon Sep 17 00:00:00 2001 From: yangzhengze <1403014932@qq.com> Date: Sun, 29 Jul 2018 21:43:56 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=A7=92=E8=89=B2=E7=A6=81?= =?UTF-8?q?=E7=94=A8=EF=BC=8C=E8=BF=98=E5=8F=AF=E4=BB=A5=E6=AD=A3=E5=B8=B8?= =?UTF-8?q?=E8=AE=BF=E9=97=AE=E5=8A=9F=E8=83=BD=E9=97=AE=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/common/constant/UserConstants.java | 3 +++ .../system/role/service/IRoleService.java | 10 ++++++++- .../system/role/service/RoleServiceImpl.java | 17 +++++++++++++++ .../user/controller/UserController.java | 21 ++++++++----------- .../resources/mybatis/system/MenuMapper.xml | 3 ++- 5 files changed, 40 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/ruoyi/common/constant/UserConstants.java b/src/main/java/com/ruoyi/common/constant/UserConstants.java index cff69c1f3..303157972 100644 --- a/src/main/java/com/ruoyi/common/constant/UserConstants.java +++ b/src/main/java/com/ruoyi/common/constant/UserConstants.java @@ -20,6 +20,9 @@ public class UserConstants /** 角色封禁状态 */ public static final String ROLE_BLOCKED = "1"; + /** 角色正常状态 */ + public static final String ROLE_NORMAL = "0"; + /** 部门正常状态 */ public static final String DEPT_NORMAL = "0"; diff --git a/src/main/java/com/ruoyi/project/system/role/service/IRoleService.java b/src/main/java/com/ruoyi/project/system/role/service/IRoleService.java index 02c6ccca5..7416b2090 100644 --- a/src/main/java/com/ruoyi/project/system/role/service/IRoleService.java +++ b/src/main/java/com/ruoyi/project/system/role/service/IRoleService.java @@ -1,8 +1,9 @@ package com.ruoyi.project.system.role.service; +import com.ruoyi.project.system.role.domain.Role; + import java.util.List; import java.util.Set; -import com.ruoyi.project.system.role.domain.Role; /** * 角色业务层 @@ -43,6 +44,13 @@ public interface IRoleService */ public List selectRoleAll(); + /** + * 查询所有正常角色 + * + * @return 正常角色列表 + */ + public List selectNORMALRoleAll(); + /** * 通过角色ID查询角色 * diff --git a/src/main/java/com/ruoyi/project/system/role/service/RoleServiceImpl.java b/src/main/java/com/ruoyi/project/system/role/service/RoleServiceImpl.java index d1df7ddc3..418f7438a 100644 --- a/src/main/java/com/ruoyi/project/system/role/service/RoleServiceImpl.java +++ b/src/main/java/com/ruoyi/project/system/role/service/RoleServiceImpl.java @@ -104,6 +104,23 @@ public class RoleServiceImpl implements IRoleService return roleMapper.selectRolesAll(); } + /** + * 查询所有正常角色 + * + * @return 正常角色列表 + */ + @Override + public List selectNORMALRoleAll() + { + List roles=roleMapper.selectRolesAll(); + List nomalRoles=new ArrayList(); + for(Role role:roles){ + if(UserConstants.ROLE_NORMAL.equals(role.getStatus())){ + nomalRoles.add(role); + } + } + return nomalRoles; + } /** * 通过角色ID查询角色 * diff --git a/src/main/java/com/ruoyi/project/system/user/controller/UserController.java b/src/main/java/com/ruoyi/project/system/user/controller/UserController.java index cb0693a13..7b8adadd4 100644 --- a/src/main/java/com/ruoyi/project/system/user/controller/UserController.java +++ b/src/main/java/com/ruoyi/project/system/user/controller/UserController.java @@ -1,16 +1,5 @@ package com.ruoyi.project.system.user.controller; -import java.util.List; -import org.apache.shiro.authz.annotation.RequiresPermissions; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Controller; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.ui.ModelMap; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.ResponseBody; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.framework.aspectj.lang.annotation.Log; @@ -22,6 +11,14 @@ import com.ruoyi.project.system.post.service.IPostService; import com.ruoyi.project.system.role.service.IRoleService; import com.ruoyi.project.system.user.domain.User; import com.ruoyi.project.system.user.service.IUserService; +import org.apache.shiro.authz.annotation.RequiresPermissions; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.ui.ModelMap; +import org.springframework.web.bind.annotation.*; + +import java.util.List; /** * 用户信息 @@ -83,7 +80,7 @@ public class UserController extends BaseController @GetMapping("/add") public String add(ModelMap mmap) { - mmap.put("roles", roleService.selectRoleAll()); + mmap.put("roles", roleService.selectNORMALRoleAll()); mmap.put("posts", postService.selectPostAll()); return prefix + "/add"; } diff --git a/src/main/resources/mybatis/system/MenuMapper.xml b/src/main/resources/mybatis/system/MenuMapper.xml index db114124f..4199a7d26 100644 --- a/src/main/resources/mybatis/system/MenuMapper.xml +++ b/src/main/resources/mybatis/system/MenuMapper.xml @@ -31,7 +31,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" from sys_menu m left join sys_role_menu rm on m.menu_id = rm.menu_id left join sys_user_role ur on rm.role_id = ur.role_id - where ur.user_id = #{userId} and m.menu_type in ('M', 'C') and m.visible = 0 + left join sys_role sr on ur.role_id=sr.role_id + where ur.user_id = #{userId} and sr.status=0 and m.menu_type in ('M', 'C') and m.visible = 0 order by m.order_num