diff --git a/core/backend/src/main/java/io/dataease/auth/service/ExtAuthService.java b/core/backend/src/main/java/io/dataease/auth/service/ExtAuthService.java index 3e035deb8a..10bdaeda3c 100644 --- a/core/backend/src/main/java/io/dataease/auth/service/ExtAuthService.java +++ b/core/backend/src/main/java/io/dataease/auth/service/ExtAuthService.java @@ -10,6 +10,8 @@ public interface ExtAuthService { Set userIdsByRD(AuthURD request); + Set userNamesByRD(AuthURD request); + AuthURD resourceTarget(String resourceId); List dataSourceIdByUser(Long userId); diff --git a/core/backend/src/main/java/io/dataease/auth/service/impl/ExtAuthServiceImpl.java b/core/backend/src/main/java/io/dataease/auth/service/impl/ExtAuthServiceImpl.java index 9be75d50aa..1926f6e513 100644 --- a/core/backend/src/main/java/io/dataease/auth/service/impl/ExtAuthServiceImpl.java +++ b/core/backend/src/main/java/io/dataease/auth/service/impl/ExtAuthServiceImpl.java @@ -43,6 +43,21 @@ public class ExtAuthServiceImpl implements ExtAuthService { return result; } + @Override + public Set userNamesByRD(AuthURD request) { + Set result = new HashSet<>(); + List roleIds = request.getRoleIds(); + List deptIds = request.getDeptIds(); + if (!CollectionUtils.isEmpty(roleIds)) { + result.addAll(extAuthMapper.queryUserNameWithRoleIds(roleIds)); + } + if (!CollectionUtils.isEmpty(deptIds)) { + result.addAll(extAuthMapper.queryUserNameWithDeptIds(deptIds)); + } + + return result; + } + @Override public AuthURD resourceTarget(String resourceId) { AuthURD authURD = new AuthURD(); diff --git a/core/backend/src/main/java/io/dataease/commons/utils/AuthUtils.java b/core/backend/src/main/java/io/dataease/commons/utils/AuthUtils.java index 5b45d27765..b151519d8c 100644 --- a/core/backend/src/main/java/io/dataease/commons/utils/AuthUtils.java +++ b/core/backend/src/main/java/io/dataease/commons/utils/AuthUtils.java @@ -71,6 +71,10 @@ public class AuthUtils { return userIds; } + public static Set accountByURD(AuthURD request) { + return extAuthService.userNamesByRD(request); + } + public static List parentResources(String resourceId, String type) { return extAuthService.parentResource(resourceId, type); } diff --git a/core/backend/src/main/java/io/dataease/ext/ExtAuthMapper.java b/core/backend/src/main/java/io/dataease/ext/ExtAuthMapper.java index 0e35cccd6e..d33fccb443 100644 --- a/core/backend/src/main/java/io/dataease/ext/ExtAuthMapper.java +++ b/core/backend/src/main/java/io/dataease/ext/ExtAuthMapper.java @@ -11,8 +11,10 @@ import java.util.List; public interface ExtAuthMapper { List queryUserIdWithRoleIds(@Param("roleIds") List roleIds); + List queryUserNameWithRoleIds(@Param("roleIds") List roleIds); List queryUserIdWithDeptIds(@Param("deptIds") List deptIds); + List queryUserNameWithDeptIds(@Param("deptIds") List deptIds); List queryByResource(@Param("resourceId") String resourceId); diff --git a/core/backend/src/main/java/io/dataease/ext/ExtAuthMapper.xml b/core/backend/src/main/java/io/dataease/ext/ExtAuthMapper.xml index 1f81c468ff..405b928cf0 100644 --- a/core/backend/src/main/java/io/dataease/ext/ExtAuthMapper.xml +++ b/core/backend/src/main/java/io/dataease/ext/ExtAuthMapper.xml @@ -16,6 +16,16 @@ + + + +