diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/ComplexQueryMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/ComplexQueryMapper.xml index 37f3da9f..5b9176e6 100644 --- a/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/ComplexQueryMapper.xml +++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/basic/ComplexQueryMapper.xml @@ -512,8 +512,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" LEFT JOIN ma_type mt4 ON mt4.type_id = mt3.parent_id LEFT JOIN ma_type_manage mtm ON mt4.type_id = mtm.type_id WHERE mt.del_flag = '0' - and mt.is_show = '1' - + and mt4.type_id is not null and mt3.type_id is not null + @@ -559,6 +559,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND mt.jiju_type = #{jiJuType} HAVING allNum > 0 + order by mt4.type_name, mt3.type_name, mt2.type_name, mt.type_name