From e7f5c0e502a89b2f91c4b57f42c56d7eb2484563 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Fri, 12 Aug 2022 15:16:25 +0800
Subject: [PATCH] 增加农场筛选条件

---
 src/main/java/org/springblade/modules/retrieval/mapper/RetrievalMapper.xml |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/src/main/java/org/springblade/modules/retrieval/mapper/RetrievalMapper.xml b/src/main/java/org/springblade/modules/retrieval/mapper/RetrievalMapper.xml
index 9826336..6d8ebe0 100644
--- a/src/main/java/org/springblade/modules/retrieval/mapper/RetrievalMapper.xml
+++ b/src/main/java/org/springblade/modules/retrieval/mapper/RetrievalMapper.xml
@@ -40,11 +40,15 @@
                 LEFT JOIN sys_strain strain ON strain.id = retrieval.strain_id
                 LEFT JOIN sys_district district ON retrieval.sale_destination = district.code
                 LEFT JOIN blade_region region on retrieval.county = region.district_code
+                LEFT JOIN sys_land land ON land.id = retrieval.land_id
         WHERE
         <if test="retrieval.strainId !=null and retrieval.strainId != '' ">
             retrieval.strain_id = #{retrieval.strainId} AND
         </if>
-            is_deleted = 0 ORDER BY retrieval.create_time DESC
+        <if test="retrieval.farmId != null and retrieval.farmId !=''">
+            land.farm_id = #{retrieval.farmId} AND
+        </if>
+            retrieval.is_deleted = 0 ORDER BY retrieval.create_time DESC
     </select>
 
 </mapper>

--
Gitblit v1.9.3