111

src/main/java/com/fdkankan/scene/service/impl/SceneEditInfoServiceImpl.java

@@ -412,11 +412,16 @@ public class SceneEditInfoServiceImpl extends ServiceImpl<SceneEditInfoMapper, S
         switch (sceneInfoReqType){
             //如果是编辑页面请求，查数据库
             case EDIT:
-                return this.getSceneInfo4Edit(param.getNum(), param.getSubgroup());
+                SceneInfoVO sceneInfo4Edit = this.getSceneInfo4Edit(param.getNum(), param.getSubgroup());
+                //俊波要求这两个字段编辑页一定是1
+                sceneInfo4Edit.getControls().setShowDollhouse(CommonStatus.YES.code());
+                sceneInfo4Edit.getControls().setShowFloorplan(CommonStatus.YES.code());
+                return sceneInfo4Edit;
             //如果是查看页面请求，查redis
             case VIEW:
                 SceneInfoVO sceneInfo = this.getSceneInfo4Edit(param.getNum(), param.getSubgroup());
                 sceneInfo.setScenePassword(null);
+                //俊波要求这两个字段查看页一定是0
                 sceneInfo.getControls().setShowDollhouse(CommonStatus.NO.code());
                 sceneInfo.getControls().setShowFloorplan(CommonStatus.NO.code());
                 return sceneInfo;

src/main/java/com/fdkankan/scene/vo/SceneEditControlsVO.java

@@ -107,4 +107,6 @@ public class SceneEditControlsVO implements Serializable {
      */
     private Integer showLinkTitle;
 
+    private Integer showDrawTitle;
+
 }