From 5d2340975cf83bfb2fcac0b60bb52639fb2eb0c3 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Wed, 11 Aug 2021 15:52:49 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=95=B0=E6=8D=AE=E9=9B=86=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF=E8=8E=B7=E5=8F=96=E6=8E=A5=E5=8F=97=E4=BA=BA=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/dataease/auth/service/impl/ExtAuthServiceImpl.java  | 6 ++++--
 .../java/io/dataease/base/mapper/ext/ExtAuthMapper.java    | 3 ++-
 .../java/io/dataease/base/mapper/ext/ExtAuthMapper.xml     | 7 +++++++
 3 files changed, 13 insertions(+), 3 deletions(-)

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<SysAuth> sysAuths = sysAuthMapper.selectByExample(example);
+        List<SysAuth> sysAuths = sysAuthMapper.selectByExample(example);*/
+        List<SysAuth> sysAuths = extAuthMapper.queryByResource(resourceId);
+
         Map<String, List<SysAuth>> 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<Long> queryUserIdWithDeptIds(@Param("deptIds") List<Long> deptIds);
 
-
+    List<SysAuth> queryByResource(@Param("resourceId") String resourceId);
     // Set<Long> queryUserIdWithRD(@Param("roleIds") List<Long> roleIds, @Param("deptIds") List<Long> 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 @@
     </select>
 
 
+    <select id="queryByResource" resultMap="io.dataease.base.mapper.SysAuthMapper.BaseResultMap" >
+        select a.*
+        from sys_auth a left join sys_auth_detail b on a.id = b.auth_id
+        where a.auth_source = #{resourceId} and  b.privilege_value = 1
+    </select>
+
+
 
 </mapper>