|
@@ -50,10 +50,10 @@ public class FusionService implements IFusionService {
|
|
|
if(StringUtils.isNotBlank(param.getSceneName())){
|
|
|
wrapper.like(ScenePlus::getTitle,param.getSceneName());
|
|
|
}
|
|
|
- if(param.getHaveVoid() == 0 && param.getNumList()!= null && param.getNumList().size() >0){
|
|
|
+ if(param.getHaveVoid() !=null && param.getHaveVoid() == 0 && param.getNumList()!= null && param.getNumList().size() >0){
|
|
|
wrapper.in(ScenePlus::getNum, param.getNumList());
|
|
|
}
|
|
|
- if(param.getHaveVoid() == 1 && param.getNumList()!= null && param.getNumList().size() >0){
|
|
|
+ if(param.getHaveVoid() !=null && param.getHaveVoid() == 1 && param.getNumList()!= null && param.getNumList().size() >0){
|
|
|
wrapper.notIn(ScenePlus::getNum, param.getNumList());
|
|
|
}
|
|
|
Page<ScenePlus> page = scenePlusService.page(new Page<>(param.getPageNum(), param.getPageSize()), wrapper);
|