fix bulbs color order

NTUEELightDance · Mar 22, 2024 · fe005e3 · fe005e3
1 parent 105c5b6
commit fe005e3
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/editor-server/src/utils/data.rs b/editor-server/src/utils/data.rs
@@ -71,7 +71,7 @@ pub async fn init_redis_control(
                     ON ControlData.effect_id = LEDEffect.id
                 LEFT JOIN LEDBulb
                     ON ControlData.id = LEDBulb.control_id
-                ORDER BY ControlData.frame_id, Dancer.id ASC, Part.id ASC;
+                ORDER BY ControlData.frame_id, Dancer.id ASC, Part.id ASC, LEDBulb.position ASC;
             "#,
         )
         .fetch_all(mysql_pool)
@@ -311,7 +311,7 @@ pub async fn update_redis_control(
                 LEFT JOIN LEDBulb
                     ON ControlData.id = LEDBulb.control_id
                 WHERE ControlData.frame_id = ?
-                ORDER BY Dancer.id ASC, Part.id ASC;
+                ORDER BY Dancer.id ASC, Part.id ASC, LEDBulb.position ASC;
             "#,
             frame.id
         )