From be9da335cb28e12e1439c24e4596f069e342d83f Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Fri, 12 Aug 2022 15:16:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml | 14 +++++++++++++-
1 files changed, 13 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 cef2023..27e8aaf 100644
--- a/src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml
+++ b/src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml
@@ -26,7 +26,7 @@
c.dict_value as dica,
v.farm_name as deptname,
l.farm_id as farmId,
- l.land_type
+ l.land_type,l.type
FROM `sys_land` l
LEFT JOIN (SELECT dict_key, dict_value FROM blade_dict_biz WHERE CODE = 'land' AND is_deleted = 0 <if
test="land.tenantId!=null and land.tenantId != ''">
@@ -56,6 +56,9 @@
</if>
<if test="land.tenantId!=null and land.tenantId != ''">
and l.tenant_id =#{land.tenantId}
+ </if>
+ <if test="land.farmId !=null and land.farmId !=''">
+ AND l.farm_id = #{land.farmId}
</if>
</select>
@@ -228,5 +231,14 @@
AND land.farm_id = #{farmId}
</if>
</select>
+ <select id="getByStrainIdFarmId" resultType="org.springblade.modules.lang.entity.Land">
+ 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}
+ </if>
+ </select>
</mapper>
--
Gitblit v1.9.3