From e852e14a3101370ce0dffe41d52fb6a41a335d8a Mon Sep 17 00:00:00 2001 From: "liang.chao" <1360241448@qq.com> Date: Fri, 28 Jun 2024 09:55:41 +0800 Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BB=A3=E7=A0=81=E6=8F=90?= =?UTF-8?q?=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/bonus/sgzb/base/controller/MaTypeController.java | 3 ++- .../src/main/resources/mapper/base/MaMachineTypeMapper.xml | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaTypeController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaTypeController.java index 5b906686..2798cc72 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaTypeController.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaTypeController.java @@ -194,8 +194,9 @@ public class MaTypeController extends BaseController { @GetMapping("/getListByMaType") public AjaxResult getListByMaType(@RequestParam(required = false) Long typeId, @RequestParam(required = false) String typeName) { + startPage(); List listByMaType = iTypeService.getListByParentId(typeId, typeName); - return success(listByMaType); + return success(getDataTable(listByMaType)); } /** diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineTypeMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineTypeMapper.xml index 89204539..2888fb1d 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineTypeMapper.xml +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineTypeMapper.xml @@ -347,7 +347,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join (select * from ma_type_file where file_type = '2') mtf2 on m.type_id = mtf2.type_id left join ma_type_keeper mtk on m.type_id = mtk.type_id left join sys_user su on mtk.user_id = su.user_id - where m.parent_id = #{typeId} and m.status = '0' and m.del_flag = '0' + where m.status = '0' and m.del_flag = '0' + + AND m.parent_id = #{typeId} + AND type_name like concat('%',#{typeName},'%')