Merge remote-tracking branch 'origin/main'

bonus-modules/bonus-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -134,6 +134,12 @@
             AND (u.dept_id = #{deptId} OR u.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE find_in_set(#{deptId},
             ancestors) ))
         </if>
+        <if test="roleIds != null and roleIds.length > 0">
+            and ur.role_id in
+            <foreach collection="roleIds" item="item" index="index" separator="," open="(" close=")">
+                #{item}
+            </foreach>
+        </if>
        <include refid="com.bonus.system.mapper.DataScopeMapper.dataScopeFilter"/>
         GROUP BY u.user_id
     </select>