|
@@ -33,9 +33,14 @@ public class FusionService implements IFusionService {
|
|
|
|
|
|
@Override
|
|
@Override
|
|
public PageInfo scenePageList(SceneParam param, String token) {
|
|
public PageInfo scenePageList(SceneParam param, String token) {
|
|
- User user = userService.getByToken(token);
|
|
|
|
- if(user == null){
|
|
|
|
- throw new BusinessException(LoginConstant.FAILURE_CODE_3015,LoginConstant.FAILURE_MSG_3015);
|
|
|
|
|
|
+ LambdaQueryWrapper<ScenePlus> wrapper = new LambdaQueryWrapper<>();
|
|
|
|
+
|
|
|
|
+ if(StringUtils.isNotBlank(token)){
|
|
|
|
+ User user = userService.getByToken(token);
|
|
|
|
+ if(user == null){
|
|
|
|
+ throw new BusinessException(LoginConstant.FAILURE_CODE_3015,LoginConstant.FAILURE_MSG_3015);
|
|
|
|
+ }
|
|
|
|
+ wrapper.eq(ScenePlus::getUserId,user.getId());
|
|
}
|
|
}
|
|
List<Integer> resourceList = new ArrayList<>();
|
|
List<Integer> resourceList = new ArrayList<>();
|
|
if(param.getType()!= null && param.getType() == 0){ //看看
|
|
if(param.getType()!= null && param.getType() == 0){ //看看
|
|
@@ -43,8 +48,6 @@ public class FusionService implements IFusionService {
|
|
}else if(param.getType()!= null && param.getType() == 1){ //看见
|
|
}else if(param.getType()!= null && param.getType() == 1){ //看见
|
|
resourceList = Collections.singletonList(3);
|
|
resourceList = Collections.singletonList(3);
|
|
}
|
|
}
|
|
- LambdaQueryWrapper<ScenePlus> wrapper = new LambdaQueryWrapper<>();
|
|
|
|
- wrapper.eq(ScenePlus::getUserId,user.getId());
|
|
|
|
if(param.getStatus() !=null && param.getStatus() == 2){
|
|
if(param.getStatus() !=null && param.getStatus() == 2){
|
|
wrapper.eq(ScenePlus::getSceneStatus,-2); //计算成功
|
|
wrapper.eq(ScenePlus::getSceneStatus,-2); //计算成功
|
|
}
|
|
}
|