1

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

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.dtflys.forest.annotation.Post;
 import com.fdkankan.fusion.common.PageInfo;
 import com.fdkankan.fusion.common.ResultCode;
+import com.fdkankan.fusion.common.util.NumTypeUtils;
 import com.fdkankan.fusion.entity.*;
 import com.fdkankan.fusion.exception.BusinessException;
 import com.fdkankan.fusion.common.ResultData;
@@ -69,17 +70,19 @@ public class CaseController extends BaseController{
                 ScenePram scenePram = new ScenePram();
                 scenePram.setStatus(-2);
                 scenePram.setNumList(Arrays.asList(caseOverview.getNum()));
+                scenePram.setSceneName(param.getSceneName());
                 Page<SceneVo> page = scenePlusService.sceneList(scenePram);
                 return ResultData.ok(PageInfo.PageInfo(page));
             }
         }
         if (param.getCaseId() != null) {
             List<CaseNumEntity> byCaseId = caseNumService.getByCaseId(param.getCaseId());
-            List<String> numList = byCaseId.stream().map(CaseNumEntity::getNum).collect(Collectors.toList());
+            List<String> numList = byCaseId.stream().filter(e -> !NumTypeUtils.isLaser(e.getNumType())).map(CaseNumEntity::getNum).collect(Collectors.toList());
             ScenePram scenePram = new ScenePram();
             scenePram.setNumList(numList);
             scenePram.setStatus(-2);
             scenePram.setPageSize(numList.size());
+            scenePram.setSceneName(param.getSceneName());
             Page<SceneVo> page = scenePlusService.sceneList(scenePram);
             return ResultData.ok(PageInfo.PageInfo(page));
         }