Schisandra-Cloud-Storage/schisandra-cloud-storage
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/origin/dev'

Browse Source
This commit is contained in:
landaiqing
2024-07-23 15:30:06 +08:00
parent b7d265fb12 1a0abb5be3
commit 3baa0ef822
5 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/impl/SchisandraAuthPermissionDomainServiceImpl.java
View File

@@ -33,7 +33,7 @@ public class SchisandraAuthPermissionDomainServiceImpl implements SchisandraAuth
schisandraAuthPermissionsParent.forEach(e -> {
List<SchisandraAuthPermissionBO> 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<SchisandraAuthRolePermission> schisandraAuthRolePermissions = schisandraAuthRolePermissionService.queryByRoleId(Long.valueOf(schisandraAuthRole.getRoleId()));
List<SchisandraAuthRolePermission> 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);
}
});

2
schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/impl/SchisandraAuthRolePermissionDomainServiceImpl.java
View File

@@ -50,7 +50,7 @@ public class SchisandraAuthRolePermissionDomainServiceImpl implements Schisandra
@Override
public List<SchisandraAuthRolePermissionBO> queryByRoleId(SchisandraAuthRolePermissionBO schisandraAuthRolePermissionBO) {
SchisandraAuthRolePermission schisandraAuthRolePermission = SchisandraAuthRolePermissionBOConverter.INSTANCE.convertBOToEntity(schisandraAuthRolePermissionBO);
List<SchisandraAuthRolePermission> schisandraAuthRolePermissions = schisandraAuthRolePermissionService.queryByRoleId(Long.valueOf(schisandraAuthRolePermission.getRoleId()));
List<SchisandraAuthRolePermission> schisandraAuthRolePermissions = schisandraAuthRolePermissionService.queryByRoleId(schisandraAuthRolePermission.getRoleId());
List<SchisandraAuthRolePermissionBO> schisandraAuthRolePermissionBOS = SchisandraAuthRolePermissionBOConverter.INSTANCE.convertEntityToBOList(schisandraAuthRolePermissions);
return schisandraAuthRolePermissionBOS;
}

2
schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-domain/src/main/java/com/schisandra/auth/domain/service/impl/SchisandraAuthUserDomainServiceImpl.java
View File

@@ -562,7 +562,7 @@ public class SchisandraAuthUserDomainServiceImpl implements SchisandraAuthUserDo
// 查询用户权限并存入redis
SchisandraAuthRolePermission schisandraAuthRolePermission = new SchisandraAuthRolePermission();
schisandraAuthRolePermission.setRoleId(String.valueOf(UserRoleEnum.NORMAL_USER.getCode()));
List<SchisandraAuthRolePermission> rolePermissionList = schisandraAuthRolePermissionService.queryByRoleId(Long.valueOf(schisandraAuthRolePermission.getRoleId()));
List<SchisandraAuthRolePermission> rolePermissionList = schisandraAuthRolePermissionService.queryByRoleId(schisandraAuthRolePermission.getRoleId());
List<String> permissionIdList = rolePermissionList.stream()
.map(SchisandraAuthRolePermission::getPermissionId).collect(Collectors.toList());
List<SchisandraAuthPermission> permissionList = schisandraAuthPermissionService.queryListByIds(permissionIdList);

4
schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/service/SchisandraAuthRolePermissionService.java
View File

@@ -42,8 +42,8 @@ public interface SchisandraAuthRolePermissionService {
* @param id 主键
* @return 是否成功
*/
boolean deleteById(Long id);
boolean deleteById(String id);
List<SchisandraAuthRolePermission> queryByRoleId(Long roleId);
List<SchisandraAuthRolePermission> queryByRoleId(String roleId);
}

4
schisandra-cloud-storage-auth/schisandra-cloud-storage-auth-infra/src/main/java/com/schisandra/auth/infra/basic/service/impl/SchisandraAuthRolePermissionServiceImpl.java
View File

@@ -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<SchisandraAuthRolePermission> queryByRoleId(Long roleId) {
public List<SchisandraAuthRolePermission> queryByRoleId(String roleId) {
return schisandraAuthRolePermissionDao.selectListByCondition(SchisandraAuthRolePermissionTableDef.SCHISANDRA_AUTH_ROLE_PERMISSION.ROLE_ID.eq(roleId));
}