THENG
/
a-tuoheng-airline
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat:修复过滤查询不生效的问题

This commit is contained in:
gyb 2026-02-27 20:08:31 +08:00
parent 7583f3f98e
commit ce52499b3e
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/ruoyi/airline/controller/AirlineAreaGroupController.java
View File

@ -190,7 +190,7 @@ public class AirlineAreaGroupController extends BaseController {
*/ */
@GetMapping("/areaList") @GetMapping("/areaList")
@Operation(summary = "根据用户ID查询空域列表") @Operation(summary = "根据用户ID查询空域列表")
public AjaxResult selectAreaListByUserId(AirlineAreaVO area) { public AjaxResult selectAreaListByUserId(@ModelAttribute AirlineAreaVO area) {
// 设置用户ID // 设置用户ID
area.setCreateBy(SecurityUtils.getUserId().toString()); area.setCreateBy(SecurityUtils.getUserId().toString());
// 转换为DTO // 转换为DTO

2
src/main/java/com/ruoyi/airline/domain/convert/AirlineAreaDomainConvert.java
View File

@ -79,7 +79,7 @@ public class AirlineAreaDomainConvert extends BaseConvert<AirlineAreaEntity, Air
entity.setAreaArea(model.getAreaArea()); entity.setAreaArea(model.getAreaArea());
entity.setAreaPerimeter(model.getAreaPerimeter()); entity.setAreaPerimeter(model.getAreaPerimeter());
entity.setRadius(model.getRadius()); entity.setRadius(model.getRadius());
entity.setRemark(entity.getRemark()); entity.setRemark(model.getRemark());
entity.setCreateBy(model.getCreateBy()); entity.setCreateBy(model.getCreateBy());
entity.setCreateTime(model.getCreateTime()); entity.setCreateTime(model.getCreateTime());
entity.setUpdateBy(model.getUpdateBy()); entity.setUpdateBy(model.getUpdateBy());

8
src/main/resources/mapper/airline/AirlineAreaMapper.xml
View File

@ -59,7 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
from airline_area from airline_area
<where> <where>
<if test="name != null and name != ''"> <if test="name != null and name != ''">
and name like CONCAT('%', #{name}, '%') and name like concat('%', #{name}, '%')
</if> </if>
<if test="areaType != null and areaType != ''"> <if test="areaType != null and areaType != ''">
and area_type = #{areaType} and area_type = #{areaType}
@ -94,13 +94,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
left join airline_area_group_info aagi on aa.id = aagi.area_id left join airline_area_group_info aagi on aa.id = aagi.area_id
left join airline_area_group aag on aagi.group_id = aag.group_id left join airline_area_group aag on aagi.group_id = aag.group_id
<where> <where>
and aagi.del_flag = 0 aagi.del_flag = 0
and aag.del_flag = 0 and aag.del_flag = 0
<if test="createBy != null"> <if test="createBy != null and createBy != ''">
and aa.create_by = #{createBy} and aa.create_by = #{createBy}
</if> </if>
<if test="name != null and name != ''"> <if test="name != null and name != ''">
and aa.name like CONCAT('%', #{name}, '%') and aa.name like concat('%', #{name}, '%')
</if> </if>
<if test="areaType != null and areaType != ''"> <if test="areaType != null and areaType != ''">
and aa.area_type = #{areaType} and aa.area_type = #{areaType}