From 9fa81aa55e58b18587abf6beda398b4a7a210d2c Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期二, 18 十月 2022 15:31:21 +0800
Subject: [PATCH] 修改办事指南 部门区域 bug

---
 flower_city/src/main/resources/mapper/TransactionEventMapper.xml |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/flower_city/src/main/resources/mapper/TransactionEventMapper.xml b/flower_city/src/main/resources/mapper/TransactionEventMapper.xml
index 3165f3a..6f12c66 100644
--- a/flower_city/src/main/resources/mapper/TransactionEventMapper.xml
+++ b/flower_city/src/main/resources/mapper/TransactionEventMapper.xml
@@ -54,8 +54,14 @@
         SELECT
             id,
             department_id,
-            (select detailed_address from automessage_organization_chart
-             where automessage_organization_chart.id=department_id) department_area,
+            concat(
+            IFNULL((SELECT name FROM area_code_2022 WHERE area_code_2022.code=(select city from automessage_organization_chart
+                    where automessage_organization_chart.id=department_id)),''),
+            IFNULL((SELECT name FROM area_code_2022 WHERE area_code_2022.code=(select district from automessage_organization_chart
+                    where automessage_organization_chart.id=department_id)),''),
+            IFnull((SELECT name FROM area_code_2022 WHERE area_code_2022.code=(select village from automessage_organization_chart
+            where automessage_organization_chart.id=department_id)),'')
+            ) AS department_area,
             (select contact_number from automessage_organization_chart where automessage_organization_chart.id=department_id) as contactNumber,
             classify_id,
             matter_name,
@@ -94,7 +100,6 @@
             transaction_area,
             transaction_area_url,
             transaction_area_name,
-            department_area,
             (IF((select classify_grade from automessage_classify_administration where automessage_classify_administration.id=automessage_transaction_event.classify_id)='2',
                 (select classify_name from automessage_classify_administration where automessage_classify_administration.id=(select parent_id from
                 automessage_classify_administration where automessage_classify_administration.id=automessage_transaction_event.classify_id)),

--
Gitblit v1.7.1