|
@@ -19,6 +19,7 @@ import com.jtgh.yjpt.common.Constants;
|
|
|
import com.jtgh.yjpt.common.MsgLevel;
|
|
|
import com.jtgh.yjpt.common.PredicateModel;
|
|
|
import com.jtgh.yjpt.common.PredicateModel.Operator;
|
|
|
+import com.jtgh.yjpt.common.SinglePageRequest;
|
|
|
import com.jtgh.yjpt.common.SpecificationCreater;
|
|
|
import com.jtgh.yjpt.common.Utils;
|
|
|
import com.jtgh.yjpt.controller.BaseController;
|
|
@@ -82,7 +83,9 @@ public class GgController extends BaseController {
|
|
|
BaseEntity.RECORD_STATE_DELETE, Operator.NEQ);
|
|
|
Specification<GgEntity> spec = SpecificationCreater
|
|
|
.searchByPredicateModels(filterList);
|
|
|
- Page<GgEntity> pageList = ggService.findAll(spec, pageable);
|
|
|
+ SinglePageRequest page = new SinglePageRequest(
|
|
|
+ pageable.getPageNumber(), pageable.getPageSize(), "desc", "id");
|
|
|
+ Page<GgEntity> pageList = ggService.findAll(spec, page);
|
|
|
for (GgEntity gg : pageList) {
|
|
|
gg = loadAccessory(gg);
|
|
|
if (!CollectionUtils.isEmpty(gg.getViewList())) {
|