Merge branch 'dx' into 'master'

fix bug

See merge request rays/pcloud-book!70

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

@@ -296,7 +296,8 @@
 
     <select id="getKeywordsIdsByBookGroupId" parameterType="long" 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}
+        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
+        group by k.id
     </select>
 
     <update id="deleteKeywords" parameterType="map">