Merge remote-tracking branch 'origin/master'

xiebin

2022-08-04 b7b04173afd9a05cedda9f44c53e52847806fb51

 src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml

@@ -219,4 +219,14 @@
        </if>
    </select>

    <select id="selectByStrainId" resultType="org.springblade.modules.lang.entity.Land">
        SELECT land.id,land.land_name,land.url,land.farm_id
        FROM sys_land land
            LEFT JOIN sys_farm_product_stock fps ON fps.land_id = land.id
        WHERE fps.strain_id = #{strainId}
        <if test="farmId !=null and farmId != '' ">
            AND land.farm_id = #{farmId}
        </if>
    </select>

</mapper>