🔥 移除 role_id 相关

ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/constants/UserResourceConstant.java

@@ -15,12 +15,6 @@ public final class UserResourceConstant {
 	 */
 	public static final String RESOURCE_ROLE = "role";
 
-	/**
-	 * 用户资源key：角色ID </br>
-	 * 角色ID资源项为角色ID(roleId)
-	 */
-	public static final String RESOURCE_ROLE_ID = "roleId";
-
 	/**
 	 * 用户资源key：权限 </br>
 	 * 权限资源项为权限ID(permissionId)

ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/modules/sys/mapper/SysPermissionMapper.java

@@ -20,11 +20,4 @@ public interface SysPermissionMapper extends BaseMapper<SysPermission> {
 	 */
 	List<PermissionVO> listPermissionVOsByRoleCode(String roleCode);
 
-	/**
-	 * 通过角色ID查询权限
-	 * @param roleIds Ids
-	 * @return
-	 */
-	List<String> listPermissionsByRoleIds(String roleIds);
-
 }

ballcat-admin/ballcat-admin-core/src/main/java/com/hccake/ballcat/admin/oauth/SysUserDetailsServiceImpl.java

@@ -71,7 +71,6 @@ public class SysUserDetailsServiceImpl implements UserDetailsService {
 		Map<String, Collection<?>> userResources = new HashMap<>();
 		userResources.put(UserResourceConstant.RESOURCE_ROLE, roles);
 		userResources.put(UserResourceConstant.RESOURCE_PERMISSION, permissions);
-		// userResources.put(UserResourceConstant.RESOURCE_ROLE_ID, roleIds);
 		// 如果有自定义的协调者，进行资源处理
 		if (userResourceCoordinator != null) {
 			userResources = userResourceCoordinator.coordinate(userResources, sysUser);

ballcat-admin/ballcat-admin-core/src/main/resources/mapper/sys/PermissionMapper.xml

@@ -35,16 +35,4 @@
 		ORDER BY
 			m.sort DESC
     </select>
-
-	<!--通过角色ID 查询权限-->
-	<select id="listPermissionsByRoleIds" resultType="java.lang.String">
-        SELECT
-            m.sysPermission
-        FROM
-        	sys_permission m, sys_role_permission rm
-        WHERE
-        	m.id = rm.permission_id
-        AND m.deleted = 0
-        AND rm.role_id IN (#{roleIds})
-    </select>
 </mapper>

ballcat-admin/ballcat-admin-core/src/main/resources/mapper/sys/SysUserMapper.xml

@@ -39,7 +39,7 @@
 			on su.user_id = ur.user_id
         left join
             sys_role r
-		     on r.id = ur.role_id
+		     on r.code = ur.role_code
         WHERE r.`code` = #{0}
         and su.deleted = 0
     </select>

ballcat-admin/ballcat-admin-core/src/main/resources/mapper/sys/SysUserRoleMapper.xml

@@ -5,7 +5,7 @@
 	<!-- 通用查询映射结果 -->
 	<resultMap id="BaseResultMap" type="com.hccake.ballcat.admin.modules.sys.model.entity.SysUserRole">
 		<id column="user_id" property="userId"/>
-		<result column="role_id" property="roleId"/>
+		<result column="role_code" property="roleCode"/>
 	</resultMap>