From 8e65eb751d8e3c18d9d2134df084d349e55f1985 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 15 Aug 2022 11:42:28 +0800
Subject: [PATCH] 首页执行农事操作要使用农资时，农资库存表会进行相应的变化
---
src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml | 9 ++++++---
1 files changed, 6 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 fc1ed16..3f13f7b 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>
@@ -155,7 +158,7 @@
<select id="selectLandList" resultType="java.util.HashMap">
select id, land_name as landName
from sys_land
- where dept_id = #{userid}
+ where farm_id = #{userid}
and is_deleted = 0
</select>
<!--土地总面积-->
@@ -229,7 +232,7 @@
</if>
</select>
<select id="getByStrainIdFarmId" resultType="org.springblade.modules.lang.entity.Land">
- SELECT land.id,land.land_name,land.url,land.farm_id
+ 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}
--
Gitblit v1.9.3