Browse Source

修改获取用户头像逻辑

huangct 8 years ago
parent
commit
2aaa02a2bf

+ 15 - 6
jpress-web-admin/src/main/java/io/jpress/admin/controller/_CommentController.java

@@ -33,6 +33,7 @@ import io.jpress.utils.StringUtils;
 
 import java.math.BigInteger;
 import java.util.Date;
+import java.util.List;
 
 @RouterMapping(url = "/admin/comment", viewPath = "/WEB-INF/admin/comment")
 @Before(ActionCacheClearInterceptor.class)
@@ -76,19 +77,29 @@ public class _CommentController extends JBaseCRUDController<Comment> {
 
 	@Override
 	public Page<Comment> onIndexDataLoad(int pageNumber, int pageSize) {
-
+		Page<Comment> page = null;
 		BigInteger contentId = getParaToBigInteger("cid");
 		BigInteger parentCommentId = getParaToBigInteger("pid");
 
 		if (StringUtils.isNotBlank(getPara("s"))) {
-			return CommentQuery.me().paginateWithContent(pageNumber, pageSize, getModule(), getType(), contentId,
+			page = CommentQuery.me().paginateWithContent(pageNumber, pageSize, getModule(), getType(), contentId,
 					parentCommentId, getPara("s"));
 		} else if (StringUtils.isNotBlank(getPara("son"))) {
-			return CommentQuery.me().paginateWithContentAndSon(pageNumber, pageSize, getModule(), getType(), contentId,
+			page = CommentQuery.me().paginateWithContentAndSon(pageNumber, pageSize, getModule(), getType(), contentId,
 					parentCommentId,getSon());
 		}
-		return CommentQuery.me().paginateWithContentNotInDelete(pageNumber, pageSize, getModule(), getType(), contentId,
+		page = CommentQuery.me().paginateWithContentNotInDelete(pageNumber, pageSize, getModule(), getType(), contentId,
 				parentCommentId);
+
+		List<Comment> comments = page.getList();
+		for (Comment comment : comments) {
+			String userAvater = comment.getUuUserAvatar();
+			if (!(StringUtils.isNotBlank(userAvater) && comment.isImageExist(userAvater))) {
+				comment.setUuUserAvatar(null);
+			}
+		}
+
+		return page;
 	}
 
 	@Override
@@ -242,6 +253,4 @@ public class _CommentController extends JBaseCRUDController<Comment> {
 		}
 	}
 
-
-
 }

+ 1 - 1
jpress-web-admin/src/main/webapp/WEB-INF/admin/comment/uuHelperCommentList.html

@@ -108,7 +108,7 @@
                                 <td>
                                     <div class="messageContent">
                                         <div class="leftImg">
-                                            <#if bean?? && bean.uu_user_avatar?? && bean.isImageExist(bean.uu_user_avatar)>
+                                            <#if bean?? && bean.uu_user_avatar??>
                                                 <img src="${(bean.uu_user_avatar)!}" alt="">
                                                 <#else>
                                                     <img src="${CPATH}/static/jpress/admin/image/defaultUuUserPhoto.png" alt="">