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/retrieval/mapper/RetrievalMapper.xml |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/src/main/java/org/springblade/modules/retrieval/mapper/RetrievalMapper.xml b/src/main/java/org/springblade/modules/retrieval/mapper/RetrievalMapper.xml
index d9e0a7d..93efdd2 100644
--- a/src/main/java/org/springblade/modules/retrieval/mapper/RetrievalMapper.xml
+++ b/src/main/java/org/springblade/modules/retrieval/mapper/RetrievalMapper.xml
@@ -23,6 +23,8 @@
         <result column="city" property="city"/>
         <result column="county" property="county"/>
         <result column="land_id" property="landId"/>
+        <result column="city_name" property="cityName"/>
+        <result column="district_name" property="countyName"/>
     </resultMap>
 
 
@@ -30,12 +32,18 @@
         SELECT
             retrieval.*,
             strain.strain_name,
-            district.name as district
+            district.name as district,
+            region.city_name,
+            region.district_name
         FROM
             sys_retrieval retrieval
                 LEFT JOIN sys_strain strain ON strain.id = retrieval.strain_id
                 LEFT JOIN sys_district district ON retrieval.sale_destination = district.code
+                LEFT JOIN blade_region region on retrieval.county = region.district_code
         WHERE
+        <if test="retrieval.strainId !=null and retrieval.strainId != '' ">
+            retrieval.strain_id = #{retrieval.strainId} AND
+        </if>
             is_deleted = 0
     </select>
 

--
Gitblit v1.9.3