Merge remote-tracking branch 'origin/master'

guoshilong

2022-07-21 66318f917918b8e718f93fe30f9c3103bab54e78

 src/main/java/org/springblade/modules/stockrecord/mapper/StockrecordMapper.xml

@@ -80,12 +80,16 @@
        LEFT JOIN (SELECT name, id FROM blade_user WHERE is_deleted = 0) a ON a.id = st.create_user
        LEFT JOIN ( SELECT agricultural_name,id FROM sys_stockfactory WHERE is_deleted = 0 ) f ON f.id = st.stock_id1
        WHERE st.is_deleted = 0
        <if test="stockrecord.agrname!=null and stockrecord.agrname != ''">
            and f.agricultural_name like concat ('%',#{stockrecord.agrname},'%')
        </if>
        <if test="stockrecord.stype!=null and stockrecord.stype != ''">
            and stf.type = #{stockrecord.stype}
        </if>
        <if test="stockrecord.sid!=null and stockrecord.sid != ''">
            and st.sid = #{stockrecord.sid}
        </if>
        ORDER BY st.create_time desc
    </select>

</mapper>