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/recovery/mapper/RecoveryMapper.xml | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/recovery/mapper/RecoveryMapper.xml b/src/main/java/org/springblade/modules/recovery/mapper/RecoveryMapper.xml
index 802bc44..8c70753 100644
--- a/src/main/java/org/springblade/modules/recovery/mapper/RecoveryMapper.xml
+++ b/src/main/java/org/springblade/modules/recovery/mapper/RecoveryMapper.xml
@@ -44,10 +44,11 @@
when sfp.plant = '0' then '有机'
when sfp.plant = 1 then '绿色'
when sfp.plant = 2 then '无公害'
- else '普通' end as lx
- from sys_recovery sr
+ else '普通' end as lx,
+ sl.farm_id farmId from sys_recovery sr
left join sys_strain ss on sr.strain_id = ss.id
left join sys_farm_plant sfp on sfp.id = sr.farm_plant_id
+ left join sys_land sl on sl.id = sr.land_id
where sr.id = #{recoveryId}
</select>
</mapper>
--
Gitblit v1.9.3