Merge branch 'fixbug/addApproval' into 'master'

bug [none] addApproval

See merge request rays/pcloud-book!1304

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

@@ -50,7 +50,7 @@ public class BookElasticSearchBizImpl {
         }
 
         PageBeanNew<BookDto> result = new PageBeanNew<>();
-        result.setCurrentPage(esResult.getCurrentPage());
+        result.setCurrentPage(esResult.getCurrentPage() - 1);
         result.setNumPerPage(esResult.getPageSize());
         result.setRecordList(bookList);
         result.setTotalCount((int) esResult.getTotalCount());

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

@@ -318,7 +318,7 @@
 			BA.GRA_LABEL_ID,BA.SUB_LABEL_ID,BA.VER_LABEL_ID,BA.AREA_LABEL_ID, BA.IS_PRINT isPrint,
 			BA.pro_label_id, BA.dep_label_id,BA.pur_label_id,BA.vol_label_id,if(G.ID IS NULL, 0, 1) isBookGroup, G.id BOOK_GROUP_ID,G.join_group_type,
 			BA.is_open_robot_process,BA.vol_label_id,b.unique_number,BA.CREATED_DATE,b.edition,BA.is_send_mini_url,
-			BA.is_open_catalog
+			BA.is_open_catalog ,BA.is_approval
 		FROM
 			BOOK_ADVISER BA	
 		INNER JOIN