Commit 52b5d59d by 吴博

bug [none] addApproval

parent f158fbf8
...@@ -50,7 +50,7 @@ public class BookElasticSearchBizImpl { ...@@ -50,7 +50,7 @@ public class BookElasticSearchBizImpl {
} }
PageBeanNew<BookDto> result = new PageBeanNew<>(); PageBeanNew<BookDto> result = new PageBeanNew<>();
result.setCurrentPage(esResult.getCurrentPage()); result.setCurrentPage(esResult.getCurrentPage() - 1);
result.setNumPerPage(esResult.getPageSize()); result.setNumPerPage(esResult.getPageSize());
result.setRecordList(bookList); result.setRecordList(bookList);
result.setTotalCount((int) esResult.getTotalCount()); result.setTotalCount((int) esResult.getTotalCount());
......
...@@ -318,7 +318,7 @@ ...@@ -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.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.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_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 FROM
BOOK_ADVISER BA BOOK_ADVISER BA
INNER JOIN INNER JOIN
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment