Merge remote-tracking branch 'origin/dev_bugfix_ljj'

epmet-user/epmet-user-server/src/main/resources/mapper/UserDao.xml

@@ -42,16 +42,16 @@
             USER_RESI_INFO resi ON user.ID = resi.USER_ID AND resi.DEL_FLAG = '0'
             LEFT JOIN
             user_base_info wechat ON user.ID = wechat.USER_ID AND wechat.DEL_FLAG = '0'
-            LEFT JOIN
+            LEFT JOIN(
-            REGISTER_RELATION relation ON user.ID = relation.USER_ID
+                select rr.GRID_ID,rr.user_id from REGISTER_RELATION rr
-            AND relation.DEL_FLAG = '0'
+                where rr.user_id=#{userId}
-            AND relation.FIRST_REGISTER = '1'
+                and rr.del_flag='0'
-            WHERE
+                and rr.FIRST_REGISTER='1'
-            user.ID = #{userId}
+                limit 1
-            AND
+            ) relation ON user.ID = relation.USER_ID
-            user.DEL_FLAG = '0'
+            WHERE user.ID = #{userId}
-            AND
+            AND  user.DEL_FLAG = '0'
-            user.FROM_APP = 'resi'
+            AND user.FROM_APP = 'resi'
     </select>
 
     <select id="selectUserBasicInfo" resultType="com.epmet.dto.result.UserBasicInfo">