diff --git a/backend/src/main/java/io/dataease/auth/service/impl/ExtAuthServiceImpl.java b/backend/src/main/java/io/dataease/auth/service/impl/ExtAuthServiceImpl.java index 07eccc92c1..e141cc1b62 100644 --- a/backend/src/main/java/io/dataease/auth/service/impl/ExtAuthServiceImpl.java +++ b/backend/src/main/java/io/dataease/auth/service/impl/ExtAuthServiceImpl.java @@ -43,9 +43,11 @@ public class ExtAuthServiceImpl implements ExtAuthService { @Override public AuthURD resourceTarget(String resourceId) { AuthURD authURD = new AuthURD(); - SysAuthExample example = new SysAuthExample(); + /*SysAuthExample example = new SysAuthExample(); example.createCriteria().andAuthSourceEqualTo(resourceId); - List sysAuths = sysAuthMapper.selectByExample(example); + List sysAuths = sysAuthMapper.selectByExample(example);*/ + List sysAuths = extAuthMapper.queryByResource(resourceId); + Map> authMap = sysAuths.stream().collect(Collectors.groupingBy(SysAuth::getAuthTargetType)); if (!CollectionUtils.isEmpty(authMap.get("user"))) { authURD.setUserIds(authMap.get("user").stream().map(item -> Long.parseLong(item.getAuthTarget())).collect(Collectors.toList())); diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/ExtAuthMapper.java b/backend/src/main/java/io/dataease/base/mapper/ext/ExtAuthMapper.java index fe7d57a75b..9e987aa586 100644 --- a/backend/src/main/java/io/dataease/base/mapper/ext/ExtAuthMapper.java +++ b/backend/src/main/java/io/dataease/base/mapper/ext/ExtAuthMapper.java @@ -1,6 +1,7 @@ package io.dataease.base.mapper.ext; +import io.dataease.base.domain.SysAuth; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -12,6 +13,6 @@ public interface ExtAuthMapper { List queryUserIdWithDeptIds(@Param("deptIds") List deptIds); - + List queryByResource(@Param("resourceId") String resourceId); // Set queryUserIdWithRD(@Param("roleIds") List roleIds, @Param("deptIds") List deptIds); } diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/ExtAuthMapper.xml b/backend/src/main/java/io/dataease/base/mapper/ext/ExtAuthMapper.xml index 991709ff3b..8e961576f2 100644 --- a/backend/src/main/java/io/dataease/base/mapper/ext/ExtAuthMapper.xml +++ b/backend/src/main/java/io/dataease/base/mapper/ext/ExtAuthMapper.xml @@ -23,5 +23,12 @@ + + +