Merge branch 'master_activity' into dev

xx-summit/xx-summit-server/src/main/java/com/xxfc/platform/summit/biz/ActivityBiz.java

@@ -40,7 +40,7 @@ public class ActivityBiz extends BaseBiz<ActivityMapper, Activity> {
      */
     private Integer PUBLISHED = 1;
 
-    public List<Activity> getList(ActivityQuery query) {
+    public PageInfo<Activity> getList(ActivityQuery query) {
 
 //        Example exa = new Example(Activity.class);
 //        Example.Criteria criteria = exa.createCriteria();

xx-summit/xx-summit-server/src/main/java/com/xxfc/platform/summit/controller/ActivityController.java

 package com.xxfc.platform.summit.controller;
 
 import com.alibaba.druid.sql.visitor.functions.If;
+import com.github.pagehelper.PageInfo;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.rest.BaseController;
 import com.xxfc.platform.summit.biz.ActivityBiz;
@@ -24,7 +25,8 @@ public class ActivityController extends BaseController<ActivityBiz, Activity> {
     @PostMapping("/app/unauth/list")
     @ApiOperation(value = "峰会列表",notes = "峰会列表")
     public ObjectRestResponse getList(@RequestBody ActivityQuery query ){
-        List<Activity> list = baseBiz.getList(query);
+        PageInfo<Activity> info= baseBiz.getList(query);
+        List<Activity> list =  info.getList();
         if (query.getType()==1) {
             for (Activity activity : list) {
                 if (activity.getStatus()==0){
@@ -43,7 +45,7 @@ public class ActivityController extends BaseController<ActivityBiz, Activity> {
                 }
             }
         }
-        return ObjectRestResponse.succ();
+        return ObjectRestResponse.succ(info);
     }
 
     @Override