Merge branch 'dev'

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