From 662d609f61c569782844c261a4c1d7535cae878b Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Thu, 18 Aug 2022 14:09:22 +0800
Subject: [PATCH] 当全部退回时也会存储退回记录，查看出入库记录时当类型为农资退回时显示 + 而非-
---
src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml | 12 +++++++++---
1 files changed, 9 insertions(+), 3 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 3f13f7b..76b5872 100644
--- a/src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml
+++ b/src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml
@@ -235,9 +235,15 @@
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 sfp.strain_id = #{strainId}
- <if test="farmId !=null and farmId != '' ">
- AND land.farm_id = #{farmId}
+ WHERE land.is_deleted = 0
+ <if test="land.strainId !=null and land.strainId !=''">
+ AND sfp.strain_id = #{land.strainId}
+ </if>
+ <if test="land.farmId !=null and land.farmId != '' ">
+ AND land.farm_id = #{land.farmId}
+ </if>
+ <if test="land.sfpStatus !=null and land.sfpStatus !=''">
+ AND sfp.status = #{land.sfpStatus}
</if>
</select>
--
Gitblit v1.9.3