From e8bcd72851448984a48cc11b003658db3b7a3c58 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Fri, 22 Jul 2022 18:06:54 +0800
Subject: [PATCH] 更新地区三级显示

---
 src/main/java/org/springblade/modules/sale/mapper/SaleMapper.xml |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 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..11691b3 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,13 +34,19 @@
             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
+        <if test="sale.strainId !=null and sale.strainId != '' ">
+            sale.strain_id = #{sale.strainId} AND
+        </if>
             sale.is_deleted = 0
     </select>
 

--
Gitblit v1.9.3