Merge remote-tracking branch 'origin/master'

2025-09-04 15:46:39 +08:00 · 2025-09-04 15:46:39 +08:00 · 4ca2b3e091
parent c66fc79469 b8cf2f3c2a
commit 4ca2b3e091
1 changed files with 3 additions and 0 deletions
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/MachineMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/ma/MachineMapper.xml
@ -229,6 +229,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        <if test="typeId != null">
            and parent_id = #{typeId}
        </if>
+        <if test="manageType != null and manageType!=''">
+            and manage_type=#{manageType}
+        </if>
    </select>

    <insert id="insertMachine" parameterType="com.bonus.material.ma.domain.Machine" useGeneratedKeys="true" keyProperty="maId">