From 6d7633051dc592f80b7967e34fa6e34f340f899d Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Mon, 18 Jul 2022 15:16:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml | 19 +++++++------------
1 files changed, 7 insertions(+), 12 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 7bec563..f790a3a 100644
--- a/src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml
+++ b/src/main/java/org/springblade/modules/lang/mapper/LandMapper.xml
@@ -23,23 +23,21 @@
l.url,
d.dict_value as dic,
c.dict_value as dica,
- v.dept_name as deptname
+ v.farm_name as deptname
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 != ''">
AND blade_dict_biz.tenant_id = #{land.tenantId}
</if> ) d
ON d.dict_key = l.land_type
- LEFT JOIN
- (SELECT dict_key, dict_value
+ LEFT JOIN (SELECT dict_key, dict_value
FROM blade_dict_biz
WHERE CODE = 'landunit'
- AND is_deleted = 0
- <if test="land.tenantId!=null and land.tenantId != ''">
- AND blade_dict_biz.tenant_id = #{land.tenantId}
- </if>
- ) c ON c.dict_key = l.land_unit
- LEFT JOIN ( SELECT id, dept_name FROM blade_dept WHERE is_deleted = 0 ) v ON v.id = l.dept_id
+ AND is_deleted = 0 <if
+ test="land.tenantId!=null and land.tenantId != ''">
+ AND blade_dict_biz.tenant_id = #{land.tenantId}
+ </if> ) c ON c.dict_key = l.land_unit
+ LEFT JOIN ( SELECT id, farm_name FROM sys_farm ) v ON v.id = l.farm_id
where l.is_deleted = 0
<if test="land.landType!=null and land.landType != ''">
and l.land_type = #{land.landType}
@@ -49,9 +47,6 @@
</if>
<if test="land.deptId!=null and land.deptId != ''">
and l.dept_id=#{land.deptId}
- </if>
- <if test="land.farmId!=null and land.farmId != ''">
- and l.farm_id=#{land.farmId}
</if>
<if test="land.type!=null and land.type != ''">
and l.type=#{land.type}
--
Gitblit v1.9.3