From 1e159ffbf027d1c8a2de5a92ff257d3b02411415 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Sat, 06 Aug 2022 16:50:11 +0800
Subject: [PATCH] 修复使用农资后，已出库待使用农资数据不变。修复使用农资后还能删除出库数据
---
src/main/java/org/springblade/modules/sale/mapper/SaleMapper.xml | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/src/main/java/org/springblade/modules/sale/mapper/SaleMapper.xml b/src/main/java/org/springblade/modules/sale/mapper/SaleMapper.xml
index 4a0bd48..343ed91 100644
--- a/src/main/java/org/springblade/modules/sale/mapper/SaleMapper.xml
+++ b/src/main/java/org/springblade/modules/sale/mapper/SaleMapper.xml
@@ -23,6 +23,8 @@
<result column="url" property="url"/>
<result column="district" property="district"/>
<result column="land_id" property="landId"/>
+ <result column="city_name" property="cityName"/>
+ <result column="district_name" property="countyName"/>
</resultMap>
@@ -32,14 +34,20 @@
user.real_name,
strain.strain_name,
strain.url,
- district.name as district
+ district.name as district,
+ region.city_name,
+ region.district_name
FROM
sys_sale sale
LEFT JOIN blade_user user on sale.create_user = user.id
LEFT JOIN sys_strain strain on sale.strain_id = strain.id
LEFT JOIN sys_district district on sale.sale_destination = district.code
+ LEFT JOIN blade_region region on sale.county = region.district_code
WHERE
- sale.is_deleted = 0
+ <if test="sale.strainId !=null and sale.strainId != '' ">
+ sale.strain_id = #{sale.strainId} AND
+ </if>
+ sale.is_deleted = 0 ORDER BY sale.create_time DESC
</select>
--
Gitblit v1.9.3