From d2267cd583b8c99ff0febcf90479af6eb4443def Mon Sep 17 00:00:00 2001
From: hongchao <3228015117@qq.com>
Date: Tue, 11 Nov 2025 11:59:13 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=BC=E5=90=88=E6=9F=A5=E8=AF=A2=E4=BF=9D?=
 =?UTF-8?q?=E6=9C=89=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/material/basic/ComplexQueryMapper.xml   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

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'
-<!--        <if test="userId != null">-->
+        and mt4.type_id is not null and mt3.type_id is not null
+        <!--        <if test="userId != null">-->
 <!--            and mtm.user_id = #{userId}-->
 <!--        </if>-->
 
@@ -559,6 +559,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             AND mt.jiju_type = #{jiJuType}
         </if>
         HAVING allNum > 0
+        order by mt4.type_name, mt3.type_name, mt2.type_name, mt.type_name
     </select>
     <select id="getStatisticsList" resultType="com.bonus.material.basic.domain.ProjUsingRecord">
         SELECT