From ea1f16f4f8e17aaa51395da494e438a98119beca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E9=B9=8F=E9=A3=9E?= <lipengfei@outlook.com>
Date: Tue, 19 Nov 2019 15:47:09 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=88=97=E8=A1=A8=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/UserDao.xml        | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml
index 3d0870983..76cdd782a 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml
@@ -69,14 +69,12 @@
         IDENTITY_NO,
         ADDRESS,
         STATE,
-        PARTY_FLAG
-        u.id,
-        u.REAL_NAME,
-        u.MOBILE,
-        u.REGISTER_TIME,
-        IDENTITY_NO,
-        STATE,
-        PARTY_FLAG
+        PARTY_FLAG,
+        CONCAT(
+        ifnull(ug.STREET,''),
+        '-',ug.COMMUNITY,
+        '-',ug.GRID
+        ) AS myGridName
         FROM
         epdc_user u
         LEFT JOIN epdc_user_grid_relation ug ON u.ID = ug.USER_ID
@@ -326,4 +324,4 @@
             AND ug_r.GRID_ID = #{deptId}
         </if>
     </select>
-</mapper>
+</mapper>
\ No newline at end of file