Merge branch 'feature-slimming-nas-20220130-dsx' into test

# Conflicts:
#	src/main/java/com/fdkankan/contro/mq/service/impl/BuildObjServiceImpl.java
#	src/main/java/com/fdkankan/contro/mq/service/impl/CommonServiceImpl.java

src/main/java/com/fdkankan/contro/mq/service/impl/BuildObjServiceImpl.java

@@ -258,12 +258,12 @@ public class BuildObjServiceImpl implements IBuildSceneService {
                         .eq(SceneProEdit::getProId,scenePro.getId()));
             }
 
-                ScenePlus scenePlus = scenePlusService.getScenePlusByNum(projectNum);
-                if(!ObjectUtils.isEmpty(scenePlus)){
-                    LambdaUpdateWrapper<ScenePlus> plusUpdateWrapper = new LambdaUpdateWrapper<ScenePlus>()
-                            .set(ScenePlus::getSceneStatus, -2).eq(ScenePlus::getNum, projectNum);
-                    scenePlusService.update(plusUpdateWrapper);
-                }
+            ScenePlus scenePlus = scenePlusService.getScenePlusByNum(projectNum);
+            if(!ObjectUtils.isEmpty(scenePlus)){
+                LambdaUpdateWrapper<ScenePlus> plusUpdateWrapper = new LambdaUpdateWrapper<ScenePlus>()
+                        .set(ScenePlus::getSceneStatus, -2).eq(ScenePlus::getNum, projectNum);
+                scenePlusService.update(plusUpdateWrapper);
+            }
 
             // 如果未升级V4,则升级V4
             if("v3".equals(version)){

src/main/java/com/fdkankan/contro/mq/service/impl/CommonServiceImpl.java

@@ -23,6 +23,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
+import java.util.Objects;
 
 @Slf4j
 @Service