Merge remote-tracking branch 'origin/dev_1118' into dev_1118

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

@@ -133,7 +133,7 @@
             eugr.LEADER_FLAG as leaderFlag
         FROM
             epdc_user eu
-            left join (select * from epdc_user_grid_relation where USER_ID = #{userId} order by UPDATED_TIME desc limit 0,1) eugr
+            left join (select * from epdc_user_grid_relation where USER_ID = #{userId} and DEL_FLAG = '0') eugr
             on(eu.id=eugr.USER_ID)
         WHERE
             eu.DEL_FLAG = '0'