From c94daaef6636779f8a48182e23f5d35b8a96dc43 Mon Sep 17 00:00:00 2001
From: liyawei <llyywwaoao@163.com>
Date: Thu, 2 Jun 2022 10:21:48 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=96=B0=E5=88=86=E9=85=8D?=
 =?UTF-8?q?=E8=A7=92=E8=89=B2=E7=9A=84=E7=94=A8=E6=88=B7=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E6=B2=A1=E5=B7=A6=E4=BE=A7=E8=8F=9C=E5=8D=95=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/jero/config/shiro/ShiroRealm.java     | 5 +++--
 .../jero/modules/system/mapper/xml/SysPermissionMapper.xml  | 6 ++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroRealm.java b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroRealm.java
index f1cbd4f48..a588c9b9f 100644
--- a/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroRealm.java
+++ b/jero-boot/jero-boot-base/jero-boot-base-core/src/main/java/com/jero/config/shiro/ShiroRealm.java
@@ -130,12 +130,13 @@ public class ShiroRealm extends AuthorizingRealm {
         // 查询用户信息
         log.debug("———校验token是否有效————checkUserTokenIsEffect——————— "+ token);
         LoginUser loginUser = null;
-        try {
+        loginUser = commonAPI.getUserByName(username);
+        /*try {
             loginUser = commonAPI.getUserByName(username);
         }catch (SerializationException e){
             LoginException.loginException(401,"用户不存在!");
             return null;
-        }
+        }*/
         if (loginUser == null) {
             LoginException.loginException(401,"用户不存在!");
             return null;
diff --git a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysPermissionMapper.xml b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysPermissionMapper.xml
index 94212f3de..ad121617a 100644
--- a/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysPermissionMapper.xml
+++ b/jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/mapper/xml/SysPermissionMapper.xml
@@ -39,8 +39,6 @@
 		    </choose>
 	</select>
 
-	<!--join sys_role b on a.role_id = b.id
-						join sys_user_role c on c.role_id = b.id-->
 	<!-- 获取登录用户拥有的权限 -->
 	<select id="queryByUser" parameterType="Object"  resultMap="SysPermission">
 		   SELECT * FROM (
@@ -48,8 +46,8 @@
 			   FROM  sys_permission p
 			   WHERE (exists(
 						select a.id from sys_role_permission a
-						join sys_depart_role b on a.role_id = b.role_id
-						join sys_depart_role_user c on c.drole_id = b.id
+						join sys_role b on a.role_id = b.id
+						join sys_user_role c on c.role_id = b.id
 						join sys_user d on d.id = c.user_id
 						where p.id = a.permission_id AND d.username = #{username,jdbcType=VARCHAR}
 					)