From 584e6a7781c3c3e53a517a6ffd8e97dbf2f737ba Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Wed, 31 Aug 2022 09:33:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/farmplant/mapper/FarmProductStockMapper.xml | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/springblade/modules/farmplant/mapper/FarmProductStockMapper.xml b/src/main/java/org/springblade/modules/farmplant/mapper/FarmProductStockMapper.xml
index 85b4538..75a7672 100644
--- a/src/main/java/org/springblade/modules/farmplant/mapper/FarmProductStockMapper.xml
+++ b/src/main/java/org/springblade/modules/farmplant/mapper/FarmProductStockMapper.xml
@@ -358,7 +358,7 @@
left join sys_land sl on sr.land_id = sl.id
WHERE 1 = 1
<if test="year!=null and year!=''">
- and YEAR ( sr.time ) = #{year}
+ and sr.time like concat('%',#{year},'%')
</if>
<if test="farmId!=null and farmId!=''">
and sl.farm_id = #{farmId}
--
Gitblit v1.9.3