From 1a0abb5be369eaa81045aad6c7ad4a221c8078c4 Mon Sep 17 00:00:00 2001 From: zlg <482370576@qq.com> Date: Tue, 23 Jul 2024 15:29:45 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E9=94=99=E8=AF=AF=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/SchisandraAuthPermissionDomainServiceImpl.java | 7 +++---- .../SchisandraAuthRolePermissionDomainServiceImpl.java | 2 +- .../service/impl/SchisandraAuthUserDomainServiceImpl.java | 2 +- .../basic/service/SchisandraAuthRolePermissionService.java | 4 ++-- .../impl/SchisandraAuthRolePermissionServiceImpl.java | 4 ++-- 5 files changed, 9 insertions(+), 10 deletions(-) diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/impl/SchisandraAuthPermissionDomainServiceImpl.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/impl/SchisandraAuthPermissionDomainServiceImpl.java index 1dee3d9..b516235 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/impl/SchisandraAuthPermissionDomainServiceImpl.java +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/impl/SchisandraAuthPermissionDomainServiceImpl.java @@ -33,7 +33,7 @@ public class SchisandraAuthPermissionDomainServiceImpl implements SchisandraAuth schisandraAuthPermissionsParent.forEach(e -> { List schisandraAuthPermissions1 = new ArrayList<>(); schisandraAuthPermissions.forEach(e1 -> { - if (e1.getParentId() == e.getId()) { + if (e1.getParentId().equals(e.getId())) { schisandraAuthPermissions1.add(e1); } }); @@ -54,7 +54,7 @@ public class SchisandraAuthPermissionDomainServiceImpl implements SchisandraAuth if (schisandraAuthRole == null || schisandraAuthRole.getRoleId() == null) { return Result.fail("用户没有角色"); } - List schisandraAuthRolePermissions = schisandraAuthRolePermissionService.queryByRoleId(Long.valueOf(schisandraAuthRole.getRoleId())); + List schisandraAuthRolePermissions = schisandraAuthRolePermissionService.queryByRoleId(schisandraAuthRole.getRoleId()); if (schisandraAuthRolePermissions.size() == 0) { return Result.fail("当前角色用户没有权限"); } @@ -63,9 +63,8 @@ public class SchisandraAuthPermissionDomainServiceImpl implements SchisandraAuth schisandraAuthRolePermissions.forEach(e -> { schisandraAuthPermissions.add(SchisandraAuthPermissionBOConverter.INSTANCE.convertEntityToBO(schisandraAuthPermissionService.queryById(e.getPermissionId()))); }); - schisandraAuthPermissions.forEach(e -> { - if (Long.parseLong(e.getParentId()) == 0) { + if (e.getParentId().equals("0")) { schisandraAuthPermissionParents.add(e); } }); diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/impl/SchisandraAuthRolePermissionDomainServiceImpl.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/impl/SchisandraAuthRolePermissionDomainServiceImpl.java index 607c168..8062945 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/impl/SchisandraAuthRolePermissionDomainServiceImpl.java +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/impl/SchisandraAuthRolePermissionDomainServiceImpl.java @@ -50,7 +50,7 @@ public class SchisandraAuthRolePermissionDomainServiceImpl implements Schisandra @Override public List queryByRoleId(SchisandraAuthRolePermissionBO schisandraAuthRolePermissionBO) { SchisandraAuthRolePermission schisandraAuthRolePermission = SchisandraAuthRolePermissionBOConverter.INSTANCE.convertBOToEntity(schisandraAuthRolePermissionBO); - List schisandraAuthRolePermissions = schisandraAuthRolePermissionService.queryByRoleId(Long.valueOf(schisandraAuthRolePermission.getRoleId())); + List schisandraAuthRolePermissions = schisandraAuthRolePermissionService.queryByRoleId(schisandraAuthRolePermission.getRoleId()); List schisandraAuthRolePermissionBOS = SchisandraAuthRolePermissionBOConverter.INSTANCE.convertEntityToBOList(schisandraAuthRolePermissions); return schisandraAuthRolePermissionBOS; } diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/impl/SchisandraAuthUserDomainServiceImpl.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/impl/SchisandraAuthUserDomainServiceImpl.java index e700403..8cd8f43 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/impl/SchisandraAuthUserDomainServiceImpl.java +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/impl/SchisandraAuthUserDomainServiceImpl.java @@ -548,7 +548,7 @@ public class SchisandraAuthUserDomainServiceImpl implements SchisandraAuthUserDo // 查询用户权限并存入redis SchisandraAuthRolePermission schisandraAuthRolePermission = new SchisandraAuthRolePermission(); schisandraAuthRolePermission.setRoleId(String.valueOf(UserRoleEnum.NORMAL_USER.getCode())); - List rolePermissionList = schisandraAuthRolePermissionService.queryByRoleId(Long.valueOf(schisandraAuthRolePermission.getRoleId())); + List rolePermissionList = schisandraAuthRolePermissionService.queryByRoleId(schisandraAuthRolePermission.getRoleId()); List permissionIdList = rolePermissionList.stream() .map(SchisandraAuthRolePermission::getPermissionId).collect(Collectors.toList()); List permissionList = schisandraAuthPermissionService.queryListByIds(permissionIdList); diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/service/SchisandraAuthRolePermissionService.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/service/SchisandraAuthRolePermissionService.java index b999819..572ee80 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/service/SchisandraAuthRolePermissionService.java +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/service/SchisandraAuthRolePermissionService.java @@ -42,8 +42,8 @@ public interface SchisandraAuthRolePermissionService { * @param id 主键 * @return 是否成功 */ - boolean deleteById(Long id); + boolean deleteById(String id); - List queryByRoleId(Long roleId); + List queryByRoleId(String roleId); } diff --git a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/service/impl/SchisandraAuthRolePermissionServiceImpl.java b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/service/impl/SchisandraAuthRolePermissionServiceImpl.java index b2fe05f..23bfce2 100644 --- a/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/service/impl/SchisandraAuthRolePermissionServiceImpl.java +++ b/schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/service/impl/SchisandraAuthRolePermissionServiceImpl.java @@ -62,12 +62,12 @@ public class SchisandraAuthRolePermissionServiceImpl implements SchisandraAuthRo * @return 是否成功 */ @Override - public boolean deleteById(Long id) { + public boolean deleteById(String id) { return this.schisandraAuthRolePermissionDao.deleteById(id) > 0; } @Override - public List queryByRoleId(Long roleId) { + public List queryByRoleId(String roleId) { return schisandraAuthRolePermissionDao.selectListByCondition(SchisandraAuthRolePermissionTableDef.SCHISANDRA_AUTH_ROLE_PERMISSION.ROLE_ID.eq(roleId)); }