From 98afc112d7031798fedd26d4c46aaa973262a54d Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Sun, 7 Apr 2019 22:16:17 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=A7=92=E8=89=B2=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=E6=9D=83=E9=99=90=E5=8F=AF=E8=A7=81=E6=80=A7=EF=BC=8C?=
 =?UTF-8?q?=E5=AD=97=E5=85=B8=E7=8A=B6=E6=80=81=E9=99=90=E5=88=B6=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruoyi/framework/aspectj/LogAspect.java    | 10 ++++----
 .../web/service/PermissionService.java        | 23 +++++++++++++++++++
 .../mapper/system/SysDictDataMapper.xml       |  2 +-
 3 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java
index 252ccbd1..a549c06e 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java
@@ -41,12 +41,12 @@ public class LogAspect
     }
 
     /**
-     * 前置通知 用于拦截操作
+     * 处理完请求后执行
      *
      * @param joinPoint 切点
      */
     @AfterReturning(pointcut = "logPointCut()")
-    public void doBefore(JoinPoint joinPoint)
+    public void doAfterReturning(JoinPoint joinPoint)
     {
         handleLog(joinPoint, null);
     }
@@ -54,11 +54,11 @@ public class LogAspect
     /**
      * 拦截异常操作
      * 
-     * @param joinPoint
-     * @param e
+     * @param joinPoint 切点
+     * @param e 异常
      */
     @AfterThrowing(value = "logPointCut()", throwing = "e")
-    public void doAfter(JoinPoint joinPoint, Exception e)
+    public void doAfterThrowing(JoinPoint joinPoint, Exception e)
     {
         handleLog(joinPoint, e);
     }
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/PermissionService.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/PermissionService.java
index da0a352d..17a793af 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/PermissionService.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/PermissionService.java
@@ -16,8 +16,31 @@ public class PermissionService
         return isPermittedOperator(permission) ? "" : "hidden";
     }
 
+    public String hasRole(String role)
+    {
+        return hasRoleOperator(role) ? "" : "hidden";
+    }
+
+    /**
+     * 判断用户是否拥有某个权限
+     * 
+     * @param permission 权限字符串
+     * @return 结果
+     */
     private boolean isPermittedOperator(String permission)
     {
         return SecurityUtils.getSubject().isPermitted(permission);
     }
+
+    /**
+     * 判断用户是否拥有某个角色
+     * 
+     * @param role 角色字符串
+     * @return 结果
+     */
+    private boolean hasRoleOperator(String role)
+    {
+        return SecurityUtils.getSubject().hasRole(role);
+    }
+
 }
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml
index f6614dad..ccfea4d7 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysDictDataMapper.xml
@@ -42,7 +42,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	
 	<select id="selectDictDataByType" parameterType="SysDictData" resultMap="SysDictDataResult">
 		<include refid="selectDictDataVo"/>
-		where dict_type = #{dictType} order by dict_sort asc
+		where status = '0' and dict_type = #{dictType} order by dict_sort asc
 	</select>
 	
 	<select id="selectDictLabel" resultType="String">