From 12be14f7ef0718bbfefab6d84bf00b6f5d92bea7 Mon Sep 17 00:00:00 2001
From: yinzuomei <yinzuomei@elink-cn.com>
Date: Wed, 18 Dec 2019 16:07:22 +0800
Subject: [PATCH] =?UTF-8?q?needCachingUserInfo=E6=8E=A5=E5=8F=A3=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E6=96=B0=E5=A2=9Egrid=E3=80=81state=E3=80=81remark?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/UserDao.xml          | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

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 80be322a7..83673183b 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
@@ -359,7 +359,10 @@
         <result property="faceImg" column="FACE_IMG"/>
         <result property="sex" column="SEX"/>
         <result property="realName" column="REAL_NAME"/>
+        <result property="state" column="STATE"/>
+        <result property="remark" column="REMARK"/>
         <result property="gridId" column="gridId"/>
+        <result property="grid" column="grid"/>
         <collection property="userTagInfos" select="com.elink.esua.epdc.dao.UserTagDao.selectByUserId"
                     column="id">
         </collection>
@@ -373,12 +376,21 @@
             eu.FACE_IMG,
             eu.SEX,
             eu.REAL_NAME,
+            eu.STATE,
+            eu.REMARK,
         (select r.GRID_ID
             from epdc_user_grid_relation r
             where r.USER_ID=eu.ID
             order by r.CREATED_TIME desc
             limit 1
-        )as gridId
+        )as gridId,
+        (
+            select r.GRID
+            from epdc_user_grid_relation r
+            where r.USER_ID=eu.ID
+            order by r.CREATED_TIME desc
+            limit 1
+        )as grid
         FROM
             epdc_user eu
         WHERE