Merge branch 'master_bugfix'

epmet-user/epmet-user-server/src/main/resources/mapper/GovStaffRoleDao.xml

@@ -72,18 +72,20 @@
     <!-- 查询用户的权限 -->
     <select id="getRoleInfoList" resultType="com.epmet.dto.result.RoleResultDTO">
         SELECT
-            gsr.role_key AS roleKey,
+        gsr.role_key AS roleKey,
-            gsr.role_name AS roleName,
+        gsr.role_name AS roleName,
-            sr.staff_id AS userId
+        sr.staff_id AS userId
         FROM
-            gov_staff_role gsr
+        gov_staff_role gsr
-            LEFT JOIN staff_role sr ON sr.role_id = gsr.id
+        LEFT JOIN staff_role sr ON sr.role_id = gsr.id
         WHERE
-            gsr.del_flag = 0
+        gsr.del_flag = 0
-            AND sr.del_flag = 0
+        AND sr.del_flag = 0
-            AND
+        AND
+        (
             <foreach collection="userIds" item="userId" separator="OR">
                 sr.staff_id = #{userId}
             </foreach>
+        )
     </select>
 </mapper>