Merge remote-tracking branch 'origin/wx-dev' into wx-dev

src/main/java/com/rymcu/forest/mapper/PortfolioMapper.java

@@ -73,4 +73,10 @@ public interface PortfolioMapper extends Mapper<Portfolio> {
      * @return
      */
     Integer unbindArticle(@Param("idPortfolio") Integer idPortfolio, @Param("idArticle") Integer idArticle);
+
+    /**
+     * 获取作品集列表数据
+     * @return
+     */
+    List<Portfolio> selectPortfolios();
 }

src/main/java/com/rymcu/forest/service/PortfolioService.java

@@ -77,4 +77,10 @@ public interface PortfolioService extends Service<Portfolio> {
      * @return
      */
     Map deletePortfolio(Integer idPortfolio);
+
+    /**
+     * 获取作品集列表数据
+     * @return
+     */
+    List<Portfolio> findPortfolios();
 }

src/main/java/com/rymcu/forest/service/impl/PortfolioServiceImpl.java

@@ -174,6 +174,11 @@ public class PortfolioServiceImpl extends AbstractService<Portfolio> implements
         return map;
     }
 
+    @Override
+    public List<Portfolio> findPortfolios() {
+        return portfolioMapper.selectPortfolios();
+    }
+
     private PortfolioDTO genPortfolioAuthor(PortfolioDTO portfolioDTO, Author author) {
         portfolioDTO.setPortfolioAuthorAvatarUrl(author.getUserAvatarURL());
         portfolioDTO.setPortfolioAuthorName(author.getUserNickname());

src/main/java/com/rymcu/forest/web/api/common/CommonApiController.java

@@ -143,9 +143,9 @@ public class CommonApiController {
     }
 
     @GetMapping("/portfolios")
-    public GlobalResult portfolios(@RequestParam(defaultValue = "0") Integer page, @RequestParam(defaultValue = "10") Integer rows) {
+    public GlobalResult portfolios(@RequestParam(defaultValue = "0") Integer page, @RequestParam(defaultValue = "12") Integer rows) {
         PageHelper.startPage(page, rows);
-        List<Portfolio> list = portfolioService.findAll();
+        List<Portfolio> list = portfolioService.findPortfolios();
         PageInfo<Portfolio> pageInfo = new PageInfo(list);
         Map map = new HashMap(2);
         map.put("portfolios", pageInfo.getList());

src/main/java/mapper/PortfolioMapper.xml

@@ -51,4 +51,7 @@
     <select id="selectMaxSortNo" resultType="java.lang.Integer">
         select ifnull(max(sort_no),0) + 1 from forest_portfolio_article where id_portfolio = #{idPortfolio}
     </select>
+    <select id="selectPortfolios" resultMap="BaseResultMap">
+        select * from forest_portfolio order by updated_time desc
+    </select>
 </mapper>