From b7b04173afd9a05cedda9f44c53e52847806fb51 Mon Sep 17 00:00:00 2001
From: xiebin <123456>
Date: Thu, 04 Aug 2022 15:56:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml b/src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml
index 446a8b8..cef2023 100644
--- a/src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml
+++ b/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>

--
Gitblit v1.9.3