bug:bug修复
This commit is contained in:
parent
888659deae
commit
7252f19a4b
|
|
@ -29,7 +29,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
<if test="airlineId != null">
|
<if test="airlineId != null">
|
||||||
and airline_id = #{airlineId}
|
and airline_id = #{airlineId}
|
||||||
</if>
|
</if>
|
||||||
order by update_time desc
|
order by update_time ASC
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<!-- 删除分组详情(软删除) -->
|
<!-- 删除分组详情(软删除) -->
|
||||||
|
|
|
||||||
|
|
@ -117,62 +117,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
and afg.user_id = #{userId}
|
and afg.user_id = #{userId}
|
||||||
</if>
|
</if>
|
||||||
</where>
|
</where>
|
||||||
order by afg.update_time desc
|
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
|
|
||||||
<!-- 通过用户ID查询所有符合条件的航线(包含分组信息) -->
|
|
||||||
<select id="selectAirlineListByUserId" parameterType="com.ruoyi.airline.mapper.entity.AirlineFileEntity" resultMap="AirlineFileResult">
|
|
||||||
select
|
|
||||||
af.id ,
|
|
||||||
af.name ,
|
|
||||||
af.file_name ,
|
|
||||||
af.air_vendor ,
|
|
||||||
af.air_type ,
|
|
||||||
af.file_url ,
|
|
||||||
af.type ,
|
|
||||||
af.source ,
|
|
||||||
af.status ,
|
|
||||||
af.file_md5 ,
|
|
||||||
af.create_by ,
|
|
||||||
af.create_time ,
|
|
||||||
af.update_by ,
|
|
||||||
af.update_time ,
|
|
||||||
af.remark ,
|
|
||||||
afg.group_id ,
|
|
||||||
afg.group_name ,
|
|
||||||
afg.user_id
|
|
||||||
from airline_file af
|
|
||||||
inner join airline_file_group_info afgi on af.id = afgi.airline_id
|
|
||||||
inner join airline_file_group afg on afgi.group_id = afg.group_id
|
|
||||||
<where>
|
|
||||||
afg.del_flag = 0
|
|
||||||
<if test="userId != null">
|
|
||||||
and afg.user_id = #{userId}
|
|
||||||
</if>
|
|
||||||
<if test="groupId != null">
|
|
||||||
and afg.group_id = #{groupId}
|
|
||||||
</if>
|
|
||||||
<if test="name != null and name != ''">
|
|
||||||
and af.name like concat('%', #{name}, '%')
|
|
||||||
</if>
|
|
||||||
<if test="type != null and type != ''">
|
|
||||||
and af.type = #{type}
|
|
||||||
</if>
|
|
||||||
<if test="status != null">
|
|
||||||
and af.status = #{status}
|
|
||||||
</if>
|
|
||||||
<if test="source != null and source != ''">
|
|
||||||
and af.source = #{source}
|
|
||||||
</if>
|
|
||||||
<if test="airVendor != null and airVendor != ''">
|
|
||||||
and af.air_vendor = #{airVendor}
|
|
||||||
</if>
|
|
||||||
<if test="airType != null and airType != ''">
|
|
||||||
and af.air_type = #{airType}
|
|
||||||
</if>
|
|
||||||
</where>
|
|
||||||
order by af.create_time desc
|
|
||||||
</select>
|
|
||||||
|
|
||||||
</mapper>
|
</mapper>
|
||||||
Loading…
Reference in New Issue