From a3251c2650bfffa5a7027c874ea5cbc45b378414 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期一, 22 四月 2024 09:18:14 +0800
Subject: [PATCH] 营销员管理-角色权限

---
 meiya-admin/src/main/java/com/sinata/modular/member/dao/mapping/MemUserMapper.xml |   32 ++++++++++++++++++++++++++------
 1 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/meiya-admin/src/main/java/com/sinata/modular/member/dao/mapping/MemUserMapper.xml b/meiya-admin/src/main/java/com/sinata/modular/member/dao/mapping/MemUserMapper.xml
index f2f759f..24df5d5 100644
--- a/meiya-admin/src/main/java/com/sinata/modular/member/dao/mapping/MemUserMapper.xml
+++ b/meiya-admin/src/main/java/com/sinata/modular/member/dao/mapping/MemUserMapper.xml
@@ -53,15 +53,35 @@
         o.signature, o.address,o.apply_time, o.audit_state, o.audit_time, o.card_type, o.integral,o.balance, o.balance_freeze, o.credit_score, o.id_card_front_image, o.id_card_back_image, o.id_card_hand_image, o.sign_image, o.equity_user_id, o.equity_order_no,
     </sql>
     <select id="getMapList" resultType="java.util.Map">
-        SELECT o.*, ur.relation_path
-        FROM mem_user o
-             LEFT JOIN mem_user_relation ur ON ur.id = o.id
+        SELECT
+            o.*,
+            ur.relation_path,
+            CASE
+                WHEN city.NAME = county.NAME THEN
+                    CONCAT( province.NAME, '-', city.NAME ) ELSE CONCAT( province.NAME, '-', city.NAME, '-', county.NAME )
+                END AS userAddress
+        FROM
+            mem_user o
+                LEFT JOIN mem_user_relation ur ON ur.id = o.id
+                LEFT JOIN t_city_region province ON province.`code` = o.agent_province_code
+                LEFT JOIN t_city_region city ON city.`code` = o.agent_city_code
+                LEFT JOIN t_city_region county ON county.`code` = o.agent_county_code
         WHERE 1 = 1 ${ew.sqlSegment}
     </select>
     <select id="getMapListAuth" resultType="java.util.Map">
-        SELECT <include refid="Auth_Column_List"/> ur.relation_path
-        FROM mem_user o
-                 LEFT JOIN mem_user_relation ur ON ur.id = o.id
+        SELECT
+            o.*,
+            ur.relation_path,
+            CASE
+                WHEN city.NAME = county.NAME THEN
+                    CONCAT( province.NAME, '-', city.NAME ) ELSE CONCAT( province.NAME, '-', city.NAME, '-', county.NAME )
+                END AS userAddress
+        FROM
+            mem_user o
+                LEFT JOIN mem_user_relation ur ON ur.id = o.id
+                LEFT JOIN t_city_region province ON province.`code` = o.agent_province_code
+                LEFT JOIN t_city_region city ON city.`code` = o.agent_city_code
+                LEFT JOIN t_city_region county ON county.`code` = o.agent_county_code
         WHERE 1 = 1 ${ew.sqlSegment}
     </select>
 

--
Gitblit v1.7.1