|
@@ -20,6 +20,7 @@ import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
import java.sql.BatchUpdateException;
|
|
|
+import java.util.ArrayList;
|
|
|
import java.util.HashMap;
|
|
|
import java.util.List;
|
|
|
import java.util.stream.Collectors;
|
|
@@ -77,6 +78,9 @@ public class ScenePlusVoidServiceImpl extends ServiceImpl<IScenePlusVoidMapper,
|
|
|
wrapper.eq(ScenePlusVoid::getStatus,1)
|
|
|
.eq(ScenePlusVoid::getUserId,user.getId());
|
|
|
List<ScenePlusVoid> list = this.list(wrapper);
|
|
|
+ if(list.size() <=0 && param.getHaveVoid() == 0){
|
|
|
+ return new PageInfo(param.getPageNum(),param.getPageSize(),0,new ArrayList<>());
|
|
|
+ }
|
|
|
if(list.size() >0){
|
|
|
List<Long> plusIds = list.parallelStream().map(ScenePlusVoid::getPlusId).collect(Collectors.toList());
|
|
|
List<ScenePlus> plusList = scenePlusService.getByIds(plusIds);
|