diff --git a/psdc-business/src/main/java/com/psdc/service/impl/PsdcSceneServiceImpl.java b/psdc-business/src/main/java/com/psdc/service/impl/PsdcSceneServiceImpl.java index 995bf84..eea9d1c 100644 --- a/psdc-business/src/main/java/com/psdc/service/impl/PsdcSceneServiceImpl.java +++ b/psdc-business/src/main/java/com/psdc/service/impl/PsdcSceneServiceImpl.java @@ -199,16 +199,7 @@ public class PsdcSceneServiceImpl implements IPsdcSceneService { } for (PsdcSceneRes psr : sceneRes) { Long code = psr.getSceneCode(); - List listByCode = new ArrayList<>(); - if (null != sceneCode && 0 != sceneCode){ - for (SceneVo sv : list) { - if (code == sv.getSceneCode()) { // 判断是否为同个策略 - listByCode.add(sv); - } - } - } else { - listByCode = psdcSceneMapper.findSceneByUserAndSceneCode(userId, code, sceneName); - } + List listByCode = psdcSceneMapper.findSceneByUserAndSceneCode(userId, code, sceneName); List ary = new ArrayList<>(); Integer deviceId = listByCode.get(0).getDeviceId(); DeviceVo deviceVo = new DeviceVo();