Merge remote-tracking branch 'origin/master'

guoshilong

2022-07-28 7425196960cc7ecda7d2a09100e0c6456309ff64

 src/main/java/org/springblade/modules/stockfactory/mapper/StockfactoryMapper.xml

@@ -38,14 +38,18 @@

    <!--小程序农资列表-->
    <select id="selectStockIn" resultType="java.util.HashMap">
        SELECT s.id                AS id,
        SELECT DISTINCT s.id                AS id,
               s.agricultural_name AS agrname,
               s.factory_name      AS factoryname,
               c.dict_value        AS dic
        FROM sys_stockfactory s
                 LEFT JOIN (SELECT dict_key, dict_value
                            FROM blade_dict_biz
                            WHERE CODE = 'stockType' AND is_deleted = 0) c ON c.dict_key = s.type
        WHERE is_deleted = 0
        <if test="name!=null and name!=''">
            and (s.agricultural_name like  concat('%',#{name},'%') or s.register_number like  concat('%',#{name},'%') )
        </if>
    </select>

</mapper>