From f1a2082d8b49e7483e2ef676450ae172d0ffb127 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Wed, 14 Sep 2022 15:29:52 +0800
Subject: [PATCH] 小程序查询采收列表增加溯源id

---
 src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml |   13 ++++++++++++-
 1 files changed, 12 insertions(+), 1 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 62ee517..b5a034b 100644
--- a/src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml
+++ b/src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml
@@ -252,7 +252,7 @@
         SELECT DISTINCT land.id,land.land_name,land.url,land.farm_id
         FROM sys_land land
         LEFT JOIN sys_farm_plant sfp ON sfp.land_id = land.id
-        WHERE land.is_deleted = 0
+        WHERE land.is_deleted = 0 AND sfp.planting_way !=2
         <if test="land.strainId !=null and land.strainId !=''">
             AND sfp.strain_id = #{land.strainId}
         </if>
@@ -270,5 +270,16 @@
         WHERE land.is_deleted = 0  AND sfp.status = 1
         AND land.id = #{ids}
     </select>
+    <select id="selectRecoveryLandList" resultType="org.springblade.modules.lang.vo.LandVO">
+        SELECT
+            DISTINCT l.id,l.land_name AS landName
+        FROM
+            sys_recovery r
+        LEFT JOIN sys_land l ON r.land_id = l.id
+        WHERE l.is_deleted = 0
+        <if test="farmId !=null and farmId !=''">
+            AND r.dept_id = #{farmId}
+        </if>
+    </select>
 
 </mapper>

--
Gitblit v1.9.3