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 cde0e6dc..281ece22 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 @@ -326,7 +326,7 @@ - + SELECT + COUNT(t.userId) + FROM (SELECT + u.ID as userId, + u.NICKNAME as nickname, + u.REGISTER_TIME as registerTime, + u.FACE_IMG as faceImg + FROM + ( + select u.ID, + u.NICKNAME , + u.FACE_IMG, + if(u.DEPT_ID is null or u.DEPT_ID= '0',ug.GRID_ID,u.DEPT_ID) as GRID_ID, + u.REGISTER_TIME from epdc_user u + LEFT JOIN ( select * from (select * from epdc_user_grid_relation order by CREATED_TIME)t group by t.USER_ID)ug ON ug.USER_ID = u.ID AND ug.DEL_FLAG = '0' + where u.DEL_FLAG ='0' and u.PARTY_FLAG = '0' AND u.STATE = '1' and (u.IDENTITY_NO is null or u.IDENTITY_NO = '') + )u + WHERE + + u.GRID_ID = #{gridId} + + u.GRID_ID in + + #{item} + + + + GROUP BY + u.ID + ORDER BY u.REGISTER_TIME DESC) t