From 0347cf437d72682e7833f6326770e6f4181fb68d 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 12:22:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=AA=E8=AE=A4=E8=AF=81=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/UserDao.xml     | 31 ++++---------------
 1 file changed, 6 insertions(+), 25 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 e10237097..cb052bbc9 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,7 +69,12 @@
             IDENTITY_NO,
             ADDRESS,
             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
@@ -237,30 +242,6 @@
             AND epaf.DEL_FLAG = '0'
             AND eu.ID = #{userId}
     </select>
-    <select id="selectWorkUserList" resultType="com.elink.esua.epdc.dto.epdc.result.EpdcWorkUserResultDTO">
-        SELECT
-        u.ID as userId,
-        u.NICKNAME as nickname,
-        u.REGISTER_TIME as registerTime,
-        u.FACE_IMG as faceImg
-        FROM
-        epdc_user_grid_relation ug_l
-        LEFT JOIN epdc_user_grid_relation ug_r ON ug_l.GRID_ID = ug_r.GRID_ID
-        LEFT JOIN epdc_user u ON ug_r.USER_ID = u.ID
-        WHERE
-        ug_l.USER_ID = #{userId}
-        AND ug_l.LEADER_FLAG = '1'
-        AND u.STATE = #{authenticatedFlag}
-        <if test='allGridFlag=="0"'>
-            AND ug_r.GRID_ID = #{deptId}
-        </if>
-        AND u.CREATED_TIME &lt;= STR_TO_DATE( #{timestamp}, '%Y-%m-%d %H:%i:%s' )
-        GROUP BY
-        u.ID
-        ORDER BY
-        u.CREATED_TIME DESC
-        LIMIT #{pageIndex},#{pageSize}
-    </select>
 
     <!-- 通过用户ID获取党员身份证号 -->
     <select id="getPartyMemberIdNoByUserID" resultType="java.lang.String">