fix: handle missing current macro scene

94f5d53b · DESKTOP-VKRD9QF\Administration · 3d4f520d · 94f5d53b
Commit 94f5d53b authored Sep 24, 2026 by $DESKTOP-VKRD9QF\Administration's avatar$ DESKTOP-VKRD9QF\Administration
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

MacroSceneController.java src/main/java/com/aps/controller/MacroSceneController.java +2 -1

No files found.
--- a/src/main/java/com/aps/controller/MacroSceneController.java
+++ b/src/main/java/com/aps/controller/MacroSceneController.java
@@ -51,7 +51,8 @@ public class MacroSceneController {
    @GetMapping("/current")
    @Operation(summary = "根据用户查询当前主计划场景")
    public R<MacroSceneConfig> current(@RequestParam String userId) {
-        return R.ok(macroSceneService.getSceneByUserId(userId));
+        MacroSceneConfig scene = macroSceneService.getSceneByUserId(userId);
+        return scene == null ? R.ok(null, "error") : R.ok(scene);
    }

    @PostMapping("/select")