diff --git a/src/main/java/com/ruoyi/airline/controller/AirlineAreaGroupController.java b/src/main/java/com/ruoyi/airline/controller/AirlineAreaGroupController.java index 243ea5c..a4766c8 100644 --- a/src/main/java/com/ruoyi/airline/controller/AirlineAreaGroupController.java +++ b/src/main/java/com/ruoyi/airline/controller/AirlineAreaGroupController.java @@ -190,7 +190,7 @@ public class AirlineAreaGroupController extends BaseController { */ @GetMapping("/areaList") @Operation(summary = "根据用户ID查询空域列表") - public AjaxResult selectAreaListByUserId(AirlineAreaVO area) { + public AjaxResult selectAreaListByUserId(@ModelAttribute AirlineAreaVO area) { // 设置用户ID area.setCreateBy(SecurityUtils.getUserId().toString()); // 转换为DTO diff --git a/src/main/java/com/ruoyi/airline/domain/convert/AirlineAreaDomainConvert.java b/src/main/java/com/ruoyi/airline/domain/convert/AirlineAreaDomainConvert.java index e11a456..15d2610 100644 --- a/src/main/java/com/ruoyi/airline/domain/convert/AirlineAreaDomainConvert.java +++ b/src/main/java/com/ruoyi/airline/domain/convert/AirlineAreaDomainConvert.java @@ -79,7 +79,7 @@ public class AirlineAreaDomainConvert extends BaseConvert - and name like CONCAT('%', #{name}, '%') + and name like concat('%', #{name}, '%') 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 aag on aagi.group_id = aag.group_id - and aagi.del_flag = 0 + aagi.del_flag = 0 and aag.del_flag = 0 - + and aa.create_by = #{createBy} - and aa.name like CONCAT('%', #{name}, '%') + and aa.name like concat('%', #{name}, '%') and aa.area_type = #{areaType}