From 2d86e3309fb4b47d298121ddbd1357d886a947f2 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Sat, 20 Aug 2022 16:28:47 +0800
Subject: [PATCH] 多传一个url
---
src/main/java/org/springblade/modules/farmplant/mapper/FarmPlantMapper.xml | 2 +-
src/main/java/org/springblade/modules/stock/mapper/StockMapper.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/farmplant/mapper/FarmPlantMapper.xml b/src/main/java/org/springblade/modules/farmplant/mapper/FarmPlantMapper.xml
index 37d20b6..5685a50 100644
--- a/src/main/java/org/springblade/modules/farmplant/mapper/FarmPlantMapper.xml
+++ b/src/main/java/org/springblade/modules/farmplant/mapper/FarmPlantMapper.xml
@@ -188,7 +188,7 @@
<!--已种植农产品列表-->
<select id="strainTree" resultType="org.springblade.modules.farmplant.entity.Strain">
- select ss.id, ss.strain_name strainName
+ select ss.id, ss.strain_name strainName,ss.url
from sys_farm_plant sfp
left join sys_strain ss on ss.id = sfp.strain_id
where sfp.status = "1"
diff --git a/src/main/java/org/springblade/modules/stock/mapper/StockMapper.xml b/src/main/java/org/springblade/modules/stock/mapper/StockMapper.xml
index b4824f9..0e55b4f 100644
--- a/src/main/java/org/springblade/modules/stock/mapper/StockMapper.xml
+++ b/src/main/java/org/springblade/modules/stock/mapper/StockMapper.xml
@@ -158,7 +158,7 @@
sys_stockrecord st
LEFT JOIN (SELECT id, agricultural_name, factory_name,type FROM sys_stockfactory) stf
ON st.stock_id1 = stf.id
- <if test="stock.stockType !=null and stock.stockType != '' ">
+ <if test="stock.stockType !=null and stock.stockType !=''">
WHERE stf.type =#{stock.stockType}
</if>
GROUP BY
--
Gitblit v1.9.3