bonus
/
devicesmgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

问题代码提交

This commit is contained in:
liang.chao 2024-06-28 09:55:41 +08:00
parent bf812851cd
commit e852e14a31
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaTypeController.java
View File

@ -194,8 +194,9 @@ public class MaTypeController extends BaseController {
@GetMapping("/getListByMaType") @GetMapping("/getListByMaType")
public AjaxResult getListByMaType(@RequestParam(required = false) Long typeId, public AjaxResult getListByMaType(@RequestParam(required = false) Long typeId,
@RequestParam(required = false) String typeName) { @RequestParam(required = false) String typeName) {
startPage();
List<MaType> listByMaType = iTypeService.getListByParentId(typeId, typeName); List<MaType> listByMaType = iTypeService.getListByParentId(typeId, typeName);
return success(listByMaType); return success(getDataTable(listByMaType));
} }
/** /**

5
sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineTypeMapper.xml
View File

@ -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 (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 ma_type_keeper mtk on m.type_id = mtk.type_id
left join sys_user su on mtk.user_id = su.user_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'
<if test="typeId != null and typeId !=''">
AND m.parent_id = #{typeId}
</if>
<if test="typeName != null and typeName !=''"> <if test="typeName != null and typeName !=''">
AND type_name like concat('%',#{typeName},'%') AND type_name like concat('%',#{typeName},'%')
</if> </if>