From 8943c61fe144368b57b77f72a65073278454257d Mon Sep 17 00:00:00 2001
From: Administrator <1923636941@qq.com>
Date: Sat, 15 Apr 2023 18:41:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xmgl/modules/stuff/mapper/xml/StuffDetailMapper.xml     | 6 ++++++
 .../modules/stuff/service/impl/StuffDetailServiceImpl.java  | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/zhgd/xmgl/modules/stuff/mapper/xml/StuffDetailMapper.xml b/src/main/java/com/zhgd/xmgl/modules/stuff/mapper/xml/StuffDetailMapper.xml
index d86a8136b..9534cade7 100644
--- a/src/main/java/com/zhgd/xmgl/modules/stuff/mapper/xml/StuffDetailMapper.xml
+++ b/src/main/java/com/zhgd/xmgl/modules/stuff/mapper/xml/StuffDetailMapper.xml
@@ -10,6 +10,12 @@
             stuff_detail sd
                 LEFT JOIN stuff_warehouse_stuff_detail swsd ON swsd.stuff_detail_id = sd.id
                 LEFT JOIN `stuff_warehouse` sw ON swsd.stuff_warehouse_id = sw.id
+                LEFT JOIN `stuff_type` st ON st.id = sd.stuff_type_id
+            <where>
+                <if test="stuffDetail.stuffTypeId != null">
+                    AND (sd.stuff_type_id = #{stuffDetail.stuffTypeId} OR sd.stuff_type_id IN ( SELECT t.id FROM stuff_type t WHERE find_in_set(#{stuffDetail.stuffTypeId}, ancestors) ))
+                </if>
+            </where>
             ${ew.customSqlSegment}
         GROUP BY sd.id
     </select>
diff --git a/src/main/java/com/zhgd/xmgl/modules/stuff/service/impl/StuffDetailServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/stuff/service/impl/StuffDetailServiceImpl.java
index 5e1227a5d..70c6660bd 100644
--- a/src/main/java/com/zhgd/xmgl/modules/stuff/service/impl/StuffDetailServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/stuff/service/impl/StuffDetailServiceImpl.java
@@ -34,7 +34,7 @@ public class StuffDetailServiceImpl extends ServiceImpl<StuffDetailMapper, Stuff
         String warehouseAlias = "sw.";
         queryWrapper
                 .eq(StringUtils.isNotBlank(stuffDetail.getProjectSn()), stuffDetailAlias + ReflectionUtil.getFieldNameToUlc(StuffDetail::getProjectSn), stuffDetail.getProjectSn())
-                .eq(stuffDetail.getStuffTypeId() != null, stuffDetailAlias + ReflectionUtil.getFieldNameToUlc(StuffDetail::getStuffTypeId), stuffDetail.getStuffTypeId())
+                //.eq(stuffDetail.getStuffTypeId() != null, stuffDetailAlias + ReflectionUtil.getFieldNameToUlc(StuffDetail::getStuffTypeId), stuffDetail.getStuffTypeId())
                 .eq(stuffDetail.getStuffWarehouseId() != null, warehouseAlias + ReflectionUtil.getFieldNameToUlc(StuffDetail::getStuffWarehouseId), stuffDetail.getStuffWarehouseId())
                 .le(stuffDetail.getEndTime() != null, stuffDetailAlias + ReflectionUtil.getFieldNameToUlc(StuffDetail::getUpdateTime), stuffDetail.getEndTime())
                 .ge(stuffDetail.getStartTime() != null, stuffDetailAlias + ReflectionUtil.getFieldNameToUlc(StuffDetail::getUpdateTime), stuffDetail.getStartTime())