fix 小程序文章标记展示

netflix-dao/src/main/java/com/cyksj/model/views/ArticleDetailView.java

@@ -29,9 +29,9 @@ public class ArticleDetailView {
 
 	private String content;
 
-	private Boolean isDz;
+	private Boolean isDz = false;
 
-	private Boolean isCol;
+	private Boolean isCol = false;
 
 	private Integer dzNum;
 

netflix-dao/src/main/java/com/cyksj/model/views/ArticleFrontView.java

@@ -16,7 +16,7 @@ import java.util.Date;
  */
 @Getter
 @Setter
-@SearchBean(tables = "article a left join article_user_mark aum2 on aum2.article_id = aum2.id :user_id:",
+@SearchBean(tables = "article a left join article_user_mark aum2 on aum2.article_id = a.id :user_id:",
 		where = "a.status is true and a.deleted is true",
 		groupBy = "a.id,a.author,a.head_img_url,a.tv_type,a.box_type,a.route_type,a.name,a.banner,a.img,a.update_time,a.dz_num,a.col_num")
 public class ArticleFrontView {
@@ -62,6 +62,6 @@ public class ArticleFrontView {
 	@DbField("if(count(if(aum2.id is not null and aum2.is_dz is true,1,NULL))>0, true,false)")
 	private Boolean isDz = false;
 
-	@DbField("if(count(if(aum2.id is not null and aum2.id is true,1,NULL))>0,true,false)")
+	@DbField("if(count(if(aum2.id is not null and aum2.is_col is true,1,NULL))>0,true,false)")
 	private Boolean isCol = false;
 }

netflix-dao/src/main/java/com/cyksj/model/views/ArticleSelfFrontView.java

@@ -49,6 +49,6 @@ public class ArticleSelfFrontView {
 	@DbField("if(count(if(aum.id is not null and aum.is_dz is true,1,NULL))>0, true,false)")
 	private Boolean isDz = false;
 
-	@DbField("if(count(if(aum.id is not null and aum.id is true,1,NULL))>0,true,false)")
+	@DbField("if(count(if(aum.id is not null and aum.is_col is true,1,NULL))>0,true,false)")
 	private Boolean isCol = false;
 }

netflix-web/src/main/java/com/cyksj/web/controller/mini/MiniController.java

@@ -80,7 +80,7 @@ public class MiniController {
 		}
 		MapBuilder builder = MapUtils.flatBuilder(request.getParameterMap());
 		if (userId != null) builder.put("user_id", String.format("and aum2.user_id = %s", userId));
-		SearchResult<ArticleFrontView> search = beanSearcher.search(ArticleFrontView.class, MapUtils.flatBuilder(request.getParameterMap())
+		SearchResult<ArticleFrontView> search = beanSearcher.search(ArticleFrontView.class, builder
 				.orderBy(ArticleFrontView::getIsDz).desc()
 				.orderBy(ArticleFrontView::getReleaseTime).desc()
 				.build());