Merge branch 'dx' into 'master'

fixbug

See merge request rays/pcloud-book!71

pcloud-service-book/src/main/java/com/pcloud/book/group/biz/impl/BookGroupClassifyBizImpl.java

@@ -177,7 +177,7 @@ public class BookGroupClassifyBizImpl implements BookGroupClassifyBiz {
 
         //同步关键词
         List<BookKeyword> bookKeywords = new ArrayList<>();
-        List<SyncKeyworsVO> syncKeyworsVOS = bookKeywordDao.getKeywordsIdsByBookGroupId(addClassifyVO.getBookGroupId());
+        List<SyncKeyworsVO> syncKeyworsVOS = bookKeywordDao.getKeywordsIdsByBookGroupId(addClassifyVO.getBookGroupId(),0L);
         syncKeyworsVOS.forEach(e -> {
             BookKeyword bookKeyword = new BookKeyword();
             bookKeyword.setBookGroupId(addClassifyVO.getBookGroupId());

pcloud-service-book/src/main/java/com/pcloud/book/keywords/dao/BookKeywordDao.java

@@ -90,7 +90,7 @@ public interface BookKeywordDao extends BaseDao<BookKeyword> {
     * @author 戴兴
     * @date 2019/7/16 15:28
     */
-    List<SyncKeyworsVO> getKeywordsIdsByBookGroupId(Long bookGroupId);
+    List<SyncKeyworsVO> getKeywordsIdsByBookGroupId(Long bookGroupId,Long classifyId);
 
     /**
     * @description 按群删除关键词

pcloud-service-book/src/main/java/com/pcloud/book/keywords/dao/impl/BookKeywordDaoImpl.java

@@ -101,8 +101,11 @@ public class BookKeywordDaoImpl extends BaseDaoImpl<BookKeyword> implements Book
     }
 
     @Override
-    public List<SyncKeyworsVO> getKeywordsIdsByBookGroupId(Long bookGroupId) {
-        return this.getSqlSession().selectList(this.getStatement("getKeywordsIdsByBookGroupId"), bookGroupId);
+    public List<SyncKeyworsVO> getKeywordsIdsByBookGroupId(Long bookGroupId, Long classifyId) {
+        Map<String, Object> paramMap = new HashMap<>();
+        paramMap.put("bookGroupId", bookGroupId);
+        paramMap.put("classifyId", classifyId);
+        return this.getSqlSession().selectList(this.getStatement("getKeywordsIdsByBookGroupId"), paramMap);
     }
 
     @Override

pcloud-service-book/src/main/resources/mapper/keywords/BookKeyword.Mapper.xml

@@ -294,9 +294,10 @@
         bk.rank ASC,bk.id DESC
     </select>
 
-    <select id="getKeywordsIdsByBookGroupId" parameterType="long" resultType="com.pcloud.book.group.vo.SyncKeyworsVO">
+    <select id="getKeywordsIdsByBookGroupId" parameterType="map" resultType="com.pcloud.book.group.vo.SyncKeyworsVO">
         select k.id keywordsId, bk.is_warehouse isWarehouse, bk.warehouse_id warehouseId from book_keyword bk
-        JOIN keyword k ON bk.keyword_id = k.id where bk.book_group_id = #{bookGroupId} and k.is_delete = 0 and bk.is_delete = 0
+        JOIN keyword k ON bk.keyword_id = k.id where bk.book_group_id = #{bookGroupId} and bk.classify_id = #{classifyId}
+        and k.is_delete = 0 and bk.is_delete = 0
         group by k.id
     </select>