修改峰会

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

@@ -31,7 +31,7 @@ public class ActivityBiz extends BaseBiz<ActivityMapper, Activity> {
      */
     private Integer PUBLISHED=1;
 
-    public PageInfo<Activity> getList(ActivityQuery query) {
+    public Object getList(ActivityQuery query) {
 
         Example exa= new Example(Activity.class);
         Example.Criteria criteria = exa.createCriteria();
@@ -45,13 +45,19 @@ public class ActivityBiz extends BaseBiz<ActivityMapper, Activity> {
         if (query.getStatus()!=null) {
             criteria.andEqualTo("status",query.getStatus());
         }
-        if (query.getType()!=null&& AccessType.PUBLIC.getCode().equals(query.getType())) {
+        if (AccessType.PUBLIC.getCode().equals(query.getType())) {
             criteria.andEqualTo("isPublish",PUBLISHED);
         }
         exa.orderBy("rank").asc().orderBy("startTime").desc();
+        if(AccessType.BACKSTAGE.getCode().equals(query.getType())){
+            return mapper.selectByExample(exa);
+        }
+
+
+
         PageHelper.startPage(query.getPage(),query.getLimit());
         List<Activity> activities = mapper.selectByExample(exa);
-        return   new PageInfo<Activity>(activities);
+        return new PageInfo<Activity>(activities);
     }
 
     @Transactional(rollbackFor = Exception.class)