Merge branch 'master' into dev

zxl

2025-03-03 f20fad8125774e487e133e909b323b43bd11db24

 system/src/main/resources/mapper/system/SysRoleMapper.xml

@@ -78,6 +78,11 @@
      where r.role_id = #{roleId}
   </select>

   <select id="selectRoleByIds" parameterType="Long" resultMap="SysRoleResult">
      <include refid="selectRoleVo"/>
      where r.role_id in <foreach collection="roleIds" open="(" separator="," close=")" item="roleId">#{roleId}</foreach>
   </select>

   <select id="selectRolesByUserName" parameterType="String" resultMap="SysRoleResult">
      <include refid="selectRoleVo"/>
      WHERE r.del_flag = '0' and u.user_name = #{userName}