From b1f340d8f5ecd76a328c738d881d7b5527c917ae Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Thu, 10 Dec 2020 15:59:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E3=80=90=E5=B7=A5?=
 =?UTF-8?q?=E4=BD=9C=E7=AB=AF=E6=9D=83=E9=99=90=E3=80=91=E8=BF=90=E8=90=A5?=
 =?UTF-8?q?=E7=AB=AF=E5=8F=96=E6=B6=88=E4=BA=86=E6=93=8D=E4=BD=9C=EF=BC=8C?=
 =?UTF-8?q?=E4=BD=86=E6=98=AF=E6=B2=A1=E5=8F=96=E6=B6=88=E8=8C=83=E5=9B=B4?=
 =?UTF-8?q?=EF=BC=8C=E5=B7=A5=E4=BD=9C=E7=AB=AF=E5=B0=8F=E7=A8=8B=E5=BA=8F?=
 =?UTF-8?q?=E4=BE=9D=E7=84=B6=E5=85=B7=E6=9C=89=E8=AF=A5=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/OperationScopeDao.xml           | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/epmet-module/gov-access/gov-access-server/src/main/resources/mapper/OperationScopeDao.xml b/epmet-module/gov-access/gov-access-server/src/main/resources/mapper/OperationScopeDao.xml
index 0591776c96..7099cf43c6 100644
--- a/epmet-module/gov-access/gov-access-server/src/main/resources/mapper/OperationScopeDao.xml
+++ b/epmet-module/gov-access/gov-access-server/src/main/resources/mapper/OperationScopeDao.xml
@@ -34,7 +34,9 @@
     <select id="listAllRoleOperationScopesByRoleId" resultType="com.epmet.dto.result.RoleOpeScopeResultDTO">
         SELECT rs.ROLE_ID, rs.OPERATION_KEY, rs.SCOPE_KEY, os.SCOPE_INDEX, os.SERIES, os.SORT
         FROM role_scope rs
-                 INNER JOIN operation_scope os ON (rs.SCOPE_KEY = os.SCOPE_KEY)
+                 INNER JOIN role_operation ro
+                    ON (rs.ROLE_ID = ro.ROLE_ID AND ro.OPERATION_KEY = rs.OPERATION_KEY AND ro.DEL_FLAG = 0)
+                 INNER JOIN operation_scope os ON (rs.SCOPE_KEY = os.SCOPE_KEY AND os.DEL_FLAG = 0)
         WHERE rs.DEL_FLAG = 0
           AND rs.ROLE_ID = #{roleId}
         ORDER BY rs.OPERATION_KEY ASC