1

src/main/java/com/fdkankan/fusion/service/impl/CaseServiceImpl.java

@@ -121,15 +121,6 @@ public class CaseServiceImpl extends ServiceImpl<ICaseMapper, CaseEntity> implem
             caseNumService.deleteByNum(param.getCaseId(),delNumList);
         }
 
-        List<String> numList = param.getTypeMap().get(3);       //关联的三维模型
-        if(numList!=null && numList.size() >0){
-            List<Model> models = modelService.getListByModelIdStrs(numList);
-            for (Model model : models) {
-                SceneVo sceneVo = new SceneVo();
-                BeanUtils.copyProperties(model,sceneVo);
-                listAll.add(sceneVo);
-            }
-        }
         //相机解绑，标注，测量隐藏，视图
         for (SceneVo sceneVo : listAll) {
             if(!sceneVo.getBind() || (sceneVo.getStatus()!=null && sceneVo.getStatus() == 3)){
@@ -139,6 +130,17 @@ public class CaseServiceImpl extends ServiceImpl<ICaseMapper, CaseEntity> implem
             }
         }
         listAll.removeIf(sceneVo -> !sceneVo.getBind());
+
+        //关联的三维模型
+        List<String> numList = param.getTypeMap().get(3);
+        if(numList!=null && numList.size() >0){
+            List<Model> models = modelService.getListByModelIdStrs(numList);
+            for (Model model : models) {
+                SceneVo sceneVo = new SceneVo();
+                BeanUtils.copyProperties(model,sceneVo);
+                listAll.add(sceneVo);
+            }
+        }
         return listAll;
     }
 

src/main/java/com/fdkankan/fusion/service/impl/SceneService.java

@@ -85,14 +85,12 @@ public class SceneService implements ISceneService {
             }
             JSONObject jsonObject = JSONObject.parseObject(JSONObject.toJSONString(fdkkResponse.getData()));
             JSONArray list = null;
-            if(StringUtils.isNotBlank(token)){
+            if(param.getNumList() == null || param.getNumList().size()<=0){
                 list = jsonObject.getJSONObject("pageInfo").getJSONArray("list");
                 total = jsonObject.getJSONObject("pageInfo").getLong("total");
-
             }else {
                 list = jsonObject.getJSONArray("list");
                 total =jsonObject.getLong("total");
-
             }
             for (Object o : list) {
                 String res = JSONObject.toJSONString(o);