冲突

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/mapper/UserDao.xml

@@ -243,30 +243,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">