diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/back/BackChangeMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/back/BackChangeMapper.xml index 9b58692..f717412 100644 --- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/back/BackChangeMapper.xml +++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/back/BackChangeMapper.xml @@ -213,6 +213,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND cd.pro_code = #{proCode} + GROUP BY tl.tool_code UNION ALL @@ -241,6 +242,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND tt.type_name like concat('%',#{typeModelName},'%') + + AND tl.tool_code like concat('%',#{devCode},'%') + AND tl.company_id = #{companyId}