Merge pull request #39 from rymcu/wx-dev

评论模块/搜索结果跳转个人主页问题修复

src/main/java/mapper/CommentMapper.xml

@@ -33,6 +33,7 @@
         <result column="id" property="idUser"/>
         <result column="nickname" property="userNickname"/>
         <result column="avatar_url" property="userAvatarURL"/>
+        <result column="account" property="userAccount"/>
     </resultMap>
     <update id="updateCommentSharpUrl">
         update forest_comment set comment_sharp_url = #{commentSharpUrl} where id = #{idComment}
@@ -41,9 +42,9 @@
         select * from forest_comment where comment_article_id = #{idArticle} order by created_time desc
     </select>
     <select id="selectAuthor" resultMap="AuthorResultMap">
-        select id,nickname,avatar_url from forest_user where id = #{commentAuthorId}
+        select id,nickname,avatar_url,account from forest_user where id = #{commentAuthorId}
     </select>
     <select id="selectCommentOriginalAuthor" resultMap="AuthorResultMap">
-        select vu.id,vu.nickname,vu.avatar_url from forest_comment vc left join forest_user vu on vu.id = vc.comment_author_id where vc.id = #{commentOriginalCommentId}
+        select vu.id,vu.nickname,vu.avatar_url,vu.account from forest_comment vc left join forest_user vu on vu.id = vc.comment_author_id where vc.id = #{commentOriginalCommentId}
     </select>
 </mapper>

src/main/java/mapper/SearchMapper.xml

@@ -13,6 +13,6 @@
         select portfolio_title as label, id as value, 'portfolio' as type from forest_portfolio
     </select>
     <select id="searchInitialUserSearch" resultMap="BaseResultMap">
-        select nickname as label, nickname as value, 'user' as type from forest_user where status = 0
+        select nickname as label, account as value, 'user' as type from forest_user where status = 0
     </select>
 </mapper>