diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/UserRoleDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/UserRoleDao.xml
index e33db2134f..c41c2685f2 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/UserRoleDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/UserRoleDao.xml
@@ -41,6 +41,14 @@
AND
ur.CUSTOMER_ID = #{customerId}
+
+ AND
+ ( ur.GRID_ID = #{gridId} OR ur.GRID_ID = 'all' )
+
+
+ AND
+ ur.GRID_ID = 'all'
+