|
@@ -1,8 +1,8 @@
|
|
|
package com.fdkankan.ucenter.service.impl;
|
|
|
|
|
|
-import com.amazonaws.services.simpleworkflow.flow.annotations.NoWait;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
|
|
|
+import com.fdkankan.common.response.PageInfo;
|
|
|
import com.fdkankan.ucenter.entity.ScenePlusVoid;
|
|
|
import com.fdkankan.ucenter.entity.User;
|
|
|
import com.fdkankan.ucenter.mapper.IScenePlusVoidMapper;
|
|
@@ -54,7 +54,7 @@ public class ScenePlusVoidServiceImpl extends ServiceImpl<IScenePlusVoidMapper,
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public String scenePageList(SceneParam param, String token) {
|
|
|
+ public PageInfo scenePageList(SceneParam param, String token) {
|
|
|
if(param.getHaveVoid()!=null){
|
|
|
User user = userService.getByToken(token);
|
|
|
LambdaQueryWrapper<ScenePlusVoid> wrapper = new LambdaQueryWrapper<>();
|
|
@@ -64,7 +64,6 @@ public class ScenePlusVoidServiceImpl extends ServiceImpl<IScenePlusVoidMapper,
|
|
|
List<String> numList = list.parallelStream().map(ScenePlusVoid::getNum).collect(Collectors.toList());
|
|
|
param.setNumList(numList);
|
|
|
}
|
|
|
- fusionService.scenePageList(param,token);
|
|
|
- return null;
|
|
|
+ return fusionService.scenePageList(param,token);
|
|
|
}
|
|
|
}
|