lyhzzz 2 anni fa
parent
commit
9d00633d89

+ 1 - 1
src/main/java/com/fdkankan/fusion/service/impl/CaseServiceImpl.java

@@ -132,7 +132,7 @@ public class CaseServiceImpl extends ServiceImpl<ICaseMapper, CaseEntity> implem
         }
         //相机解绑,标注,测量隐藏,视图
         for (SceneVo sceneVo : listAll) {
-            if(!sceneVo.getBind()){
+            if(!sceneVo.getBind() || sceneVo.getStatus() == 3){
                 fusionNumService.hideOrShow(sceneVo.getModelId(),sceneVo.getNum(),1);
             }else {
                 fusionNumService.hideOrShow(sceneVo.getModelId(),sceneVo.getNum(),0);

+ 3 - 3
src/main/java/com/fdkankan/fusion/service/impl/SceneService.java

@@ -122,9 +122,6 @@ public class SceneService implements ISceneService {
             String res = JSONObject.toJSONString(obj);
             SceneProEntityVo fdkkScenePlusVo = JSONObject.parseObject(res, SceneProEntityVo.class);
             SceneVo sceneVo = new SceneVo();
-            if(fdkkScenePlusVo.getUserId()== null ){
-                sceneVo.setBind(false);
-            }
             sceneVo.setId(fdkkScenePlusVo.getId());
             sceneVo.setBuildObjStatus(0);
             sceneVo.setCreateTime(fdkkScenePlusVo.getCreateTime());
@@ -139,6 +136,9 @@ public class SceneService implements ISceneService {
             sceneVo.setViewCount(fdkkScenePlusVo.getViewCount());
             sceneVo.setIsLaser(false);
             sceneVo.setType(fdkkScenePlusVo.getSceneType());
+            if(fdkkScenePlusVo.getUserId()== null){
+                sceneVo.setBind(false);
+            }
             sceneVoList.add(sceneVo);
         }
         return sceneVoList;