diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tyre/BaseCarController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tyre/BaseCarController.java index c00e7174..51149ba5 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tyre/BaseCarController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/tyre/BaseCarController.java @@ -147,9 +147,12 @@ public class BaseCarController extends BaseController @PostMapping("/PdaQueryCarList") @ResponseBody - public AjaxResult PdaQueryCarList(@RequestBody BaseCar baseCar) + public AjaxResult PdaQueryCarList(BaseCar baseCar) { List list = baseCarService.selectBaseCarList(baseCar); + if (list == null || list.isEmpty()){ + return AjaxResult.error("查询到的车辆基础信息为空"); + } return AjaxResult.success(list); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BaseCarServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BaseCarServiceImpl.java index 4012f8a7..b44a7c41 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BaseCarServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/BaseCarServiceImpl.java @@ -61,9 +61,20 @@ public class BaseCarServiceImpl implements IBaseCarService @DataScope(deptAlias = "d", userAlias = "u") public List selectBaseCarList(BaseCar baseCar) { + + String carNo = baseCar.getCarNo(); + baseCar.setCarNo(buildLikePattern(carNo)); return baseCarMapper.selectBaseCarList(baseCar); } - + public static String buildLikePattern(String input) { + if (input == null || input.isEmpty()) { + return "%"; + } + return "%" + input.chars() + .mapToObj(c -> String.valueOf((char) c)) + .reduce((a, b) -> a + "%" + b) + .orElse("") + "%"; + } /** * 新增车辆基础信息 *