Merge branch 'fixbug/1023934' into 'master'

fixbug:[more]解决bug1023933/1023934

See merge request rays/pcloud-book!770

pcloud-service-book/src/main/java/com/pcloud/book/applet/dao/impl/AppletUserBookcaseDaoImpl.java

@@ -113,6 +113,8 @@ public class AppletUserBookcaseDaoImpl extends BaseDaoImpl<AppletUserBookcase> i
 
     @Override
     public List<Long> getBookIdsByIds(List<Long> ids) {
-        return getSessionTemplate().selectList(getStatement("getBookIdsByIds"), ids);
+        Map<String, Object> map = new HashMap<>();
+        map.put("ids", ids);
+        return getSessionTemplate().selectList(getStatement("getBookIdsByIds"), map);
     }
 }

pcloud-service-book/src/main/java/com/pcloud/book/es/biz/impl/ESBookAndAdviserBizImpl.java

@@ -110,7 +110,7 @@ public class ESBookAndAdviserBizImpl implements ESBookAndAdviserBiz {
     @ParamLog("更新书和编辑书")
     @Override
     public void updateBookAndAdviserToES(List<Long> bookIds) {
-        if(bookIds==null){
+        if (ListUtils.isEmpty(bookIds)) {
             return;
         }
         try {
@@ -185,16 +185,19 @@ public class ESBookAndAdviserBizImpl implements ESBookAndAdviserBiz {
     public Page<ESBookAndAdviser> getESAdviserBooks4Applet(String grayStatus, String keyword, List<Long> templetIds, List<Long> graLabelIds, List<Long> subLabelIds, Integer currentPage, Integer numPerPage, List<Long> scecondTempletIds) {
         BoolQueryBuilder boolQueryBuilder = QueryBuilders.boolQuery()
                 .filter(QueryBuilders.termQuery("isBookDelete", 0))
-                .filter(ListUtils.isEmpty(templetIds) ? QueryBuilders.boolQuery() : QueryBuilders.termsQuery("templetId", templetIds))
-                .filter(ListUtils.isEmpty(graLabelIds) ? QueryBuilders.boolQuery() : QueryBuilders.termsQuery("graLabelId", graLabelIds))
-                .filter(ListUtils.isEmpty(subLabelIds) ? QueryBuilders.boolQuery() : QueryBuilders.termsQuery("subLabelId", subLabelIds))
-                .filter(ListUtils.isEmpty(scecondTempletIds) ? QueryBuilders.boolQuery() : QueryBuilders.termsQuery("secondTempletId", scecondTempletIds));
+                .filter(ListUtils.isEmpty(templetIds) ? QueryBuilders.boolQuery() : QueryBuilders.termsQuery("templetId", templetIds));
         BoolQueryBuilder should = QueryBuilders.boolQuery()
                 .should(StringUtil.isEmpty(keyword) ? QueryBuilders.boolQuery() : QueryBuilders.wildcardQuery("bookName",  keyword))
                 .should(StringUtil.isEmpty(keyword) ? QueryBuilders.boolQuery() : QueryBuilders.wildcardQuery("isbn", "*" + keyword + "*"));
         BoolQueryBuilder should1 = QueryBuilders.boolQuery()
                 .should(QueryBuilders.termQuery("isBookAdviserDelete", 0))
                 .should(QueryBuilders.termQuery("isAdviserBook", 0));
+        //（年级&&科目）||二级分类
+        BoolQueryBuilder must1 = QueryBuilders.boolQuery()
+                .filter(ListUtils.isEmpty(graLabelIds) ? QueryBuilders.boolQuery() : QueryBuilders.termsQuery("graLabelId", graLabelIds))
+                .filter(ListUtils.isEmpty(subLabelIds) ? QueryBuilders.boolQuery() : QueryBuilders.termsQuery("subLabelId", subLabelIds));
+        BoolQueryBuilder must2 = QueryBuilders.boolQuery().filter(ListUtils.isEmpty(scecondTempletIds) ? QueryBuilders.boolQuery() : QueryBuilders.termsQuery("secondTempletId", scecondTempletIds));
+        BoolQueryBuilder should2 = QueryBuilders.boolQuery().should(must1).should(must2);
         // 审核通过之后屏蔽掉测试编辑的书刊
         BoolQueryBuilder adviserIdBuilder = QueryBuilders.boolQuery();
         if (YesOrNoEnums.YES.getCode().equals(grayStatus)) {
@@ -219,6 +222,15 @@ public class ESBookAndAdviserBizImpl implements ESBookAndAdviserBiz {
         }
         boolQueryBuilder.must(should);
         boolQueryBuilder.must(should1);
+        if (!ListUtils.isEmpty(scecondTempletIds)) {
+            if (ListUtils.isEmpty(graLabelIds) && ListUtils.isEmpty(subLabelIds)) {
+                boolQueryBuilder.must(must2);
+            } else {
+                boolQueryBuilder.must(should2);
+            }
+        } else if (!ListUtils.isEmpty(graLabelIds) || !ListUtils.isEmpty(subLabelIds)) {
+            boolQueryBuilder.must(must1);
+        }
         Sort sort = new Sort(Sort.Direction.DESC, "bookUserCount", "resourceCount", "isAdviserBook", "lastModifiedDate", "bookId");
         PageRequest pageRequest = new PageRequest(currentPage, numPerPage, sort);
         Page<ESBookAndAdviser> search = bookAndAdviserRepository.search(boolQueryBuilder, pageRequest);

pcloud-service-book/src/main/resources/mapper/applet/AppletUserBookcase.xml

@@ -217,7 +217,7 @@
      GROUP BY book_id, adviser_id, channel_id
     </select>
 
-    <select id="getBookIdsByIds" resultType="long" parameterType="list">
+    <select id="getBookIdsByIds" resultType="long" parameterType="map">
         SELECT DISTINCT book_id
         FROM applet_user_bookcase
         WHERE id in