From 599dca5d4492a6428cc82a7a772c5c274498e9a0 Mon Sep 17 00:00:00 2001
From: XMnhwj_BackTechnologyDevelopment <3512363680@qq.com>
Date: Tue, 30 May 2023 10:17:06 +0800
Subject: [PATCH] =?UTF-8?q?2023-05-30=2010:24:36=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=AD=96=E7=95=A5=E7=AE=A1=E7=90=86=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E3=80=81=E6=9F=A5=E8=AF=A2=E3=80=81=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3!?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/psdc/service/impl/PsdcSceneServiceImpl.java   | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

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<SceneVo> 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<SceneVo> listByCode = psdcSceneMapper.findSceneByUserAndSceneCode(userId, code, sceneName);
             List<DeviceVo> ary = new ArrayList<>();
             Integer deviceId = listByCode.get(0).getDeviceId();
             DeviceVo deviceVo = new DeviceVo();