From b74c2b6bc5b50225a7441fe333a418e6938b98c3 Mon Sep 17 00:00:00 2001
From: yinzuomei <yinzuomei@elink-cn.com>
Date: Wed, 15 Jan 2020 18:21:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2CachingUserInfoDTOsql?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/UserDao.xml     | 38 ++++++++++---------
 1 file changed, 21 insertions(+), 17 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 006d43d2d..284ca5116 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
@@ -400,26 +400,28 @@
     <!--  获取用户缓存信息  -->
     <select id="selectCachingUserInfoDTO" parameterType="map" resultMap="CachingUserInfoDTOMap">
         SELECT
-            eu.ID,
-            eu.NICKNAME,
-            eu.MOBILE,
-            eu.FACE_IMG,
-            eu.SEX,
-            eu.REAL_NAME,
-            eu.STATE,
-            eu.REMARK,
+        eu.ID,
+        eu.NICKNAME,
+        eu.MOBILE,
+        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
+        from epdc_user_grid_relation r
+        where r.USER_ID=eu.ID
+        and r.DEL_FLAG='0'
+        order by r.CREATED_TIME desc
+        limit 1
         )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
+        select r.GRID
+        from epdc_user_grid_relation r
+        where r.USER_ID=eu.ID
+        and r.DEL_FLAG='0'
+        order by r.CREATED_TIME desc
+        limit 1
         )as grid
         FROM
         epdc_user eu
@@ -447,6 +449,7 @@
         (select r.GRID_ID
             from epdc_user_grid_relation r
             where r.USER_ID=eu.ID
+            and r.DEL_FLAG='0'
             order by r.CREATED_TIME desc
             limit 1
         )as gridId,
@@ -454,6 +457,7 @@
             select r.GRID
             from epdc_user_grid_relation r
             where r.USER_ID=eu.ID
+            and r.DEL_FLAG='0'
             order by r.CREATED_TIME desc
             limit 1
         )as grid