1

src/main/java/com/fdkankan/fusion/controller/CaseController.java

@@ -21,6 +21,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -68,7 +69,8 @@ public class CaseController extends BaseController{
                 ScenePram scenePram = new ScenePram();
                 scenePram.setNumList(Arrays.asList(caseOverview.getNum()));
                 Page<SceneVo> page = scenePlusService.sceneList(scenePram);
-                return ResultData.ok(PageInfo.PageInfo(page));
+                //return ResultData.ok(PageInfo.PageInfo(page));
+                return ResultData.ok(page.getRecords());
             }
         }
         if (param.getCaseId() != null) {
@@ -76,10 +78,13 @@ public class CaseController extends BaseController{
             List<String> numList = byCaseId.stream().map(CaseNumEntity::getNum).collect(Collectors.toList());
             ScenePram scenePram = new ScenePram();
             scenePram.setNumList(numList);
+            scenePram.setPageSize(numList.size());
             Page<SceneVo> page = scenePlusService.sceneList(scenePram);
-            return ResultData.ok(PageInfo.PageInfo(page));
+            //return ResultData.ok(PageInfo.PageInfo(page));
+            return ResultData.ok(page.getRecords());
         }
-        return ResultData.ok(PageInfo.PageInfoEmpty());
+        //return ResultData.ok(PageInfo.PageInfoEmpty());
+        return ResultData.ok(new ArrayList<>());
     }
 
     @PostMapping("/addOrUpdate")