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

src/main/resources/mapper/ArticleMapper.xml

@@ -42,7 +42,7 @@
 			a.title as title,
 			a.guidanceImage as image,
 			a.publisher as publisher,
-			a.pubdate as publish_date,
+			a.pubdate as publishDate,
 			a.recommendContent as intro,
 			a.infoContent as content,
 			(IFNULL(c.pv, 0) + IFNULL(a.basePv, 0) + IFNULL((c.num + a.basePraise), 0)) as pv,
@@ -101,7 +101,7 @@
 		  a.title AS title,
 		  a.guidanceImage AS image,
 		  a.publisher AS publisher,
-		  a.pubdate AS publish_date,
+		  a.pubdate AS publishDate,
 		  a.recommendContent AS intro,
 		  a.infoContent AS content,
 		  (

src/main/resources/mapper/ProductMapper.xml

@@ -54,6 +54,7 @@
         left join province as pr on ci.provinceID = pr.provinceID
 
 		where p.productID = #{productId}
+		and p.validFlag in (2,3)
 	</select>
 	<select id="getProductRecommendsById" resultType="com.caimei.www.pojo.page.ProductList">
         select