dev-1.1.2-20240311-1

src/main/java/com/fdkankan/site/service/impl/SceneServiceImpl.java

@@ -181,7 +181,7 @@ public class SceneServiceImpl implements ISceneService {
                 list = jsonObject.getJSONArray("list");
                 total = jsonObject.getLong("total");
             }
-            sceneVoList =overSceneVo(list,2);
+            sceneVoList =overSceneVo(list, param.getType() );
         }
         //一个场景对应一个项目 已绑定项目的设置为不可绑定
         Set<String> numList = projectNumService.getNumList();
@@ -201,7 +201,7 @@ public class SceneServiceImpl implements ISceneService {
      */
     private List<SceneVo> overSceneVo(JSONArray list,Integer type) {
         List<SceneVo> sceneVoList = new ArrayList<>();
-        if(type == 2){  //深时
+        if(type == 2||type == 3){  //深时 深光
             for (Object o : list) {
                 String res = JSONObject.toJSONString(o);
                 SceneVo vo = JSONObject.parseObject(res,SceneVo.class);
@@ -211,7 +211,7 @@ public class SceneServiceImpl implements ISceneService {
 //                if (StringUtils.isBlank(vo.getPhone())) {
 //                    vo.setBind(false);
 //                }
-                vo.setType(2);
+                vo.setType(type);
                 sceneVoList.add(vo);
             }
         }else {