lyhzzz 2 years ago
parent
commit
ceff4b3a43

+ 2 - 2
src/main/java/com/fdkankan/manage/controller/SceneController.java

@@ -115,11 +115,11 @@ public class SceneController {
     @GetMapping("/rebuildScene")
     @GetMapping("/rebuildScene")
     public ResultData rebuild(@RequestParam(required = false) String num){
     public ResultData rebuild(@RequestParam(required = false) String num){
         ScenePro scenePro = sceneProService.getByNum(num);
         ScenePro scenePro = sceneProService.getByNum(num);
-        if(scenePro!=null){
+        if(scenePro!=null && scenePro.getSceneSource() != 4){
             throw new BusinessException(ResultCode.V3_SCENE_REBUILD);
             throw new BusinessException(ResultCode.V3_SCENE_REBUILD);
         }
         }
         ScenePlus scenePlus = scenePlusService.getByNum(num);
         ScenePlus scenePlus = scenePlusService.getByNum(num);
-        if(scenePlus == null){
+        if(scenePlus == null && scenePro == null){
             throw new BusinessException(ResultCode.SCENE_NOT_EXIST);
             throw new BusinessException(ResultCode.SCENE_NOT_EXIST);
         }
         }
         HashMap<String,Object> paramMap = new HashMap<>();
         HashMap<String,Object> paramMap = new HashMap<>();