Эх сурвалжийг харах

修復 BUG 抽獎部門簡稱 刪除抽獎期限

maa3520 2 жил өмнө
parent
commit
a850c134d0

+ 2 - 2
app/Http/Controllers/DrawController.php

@@ -30,7 +30,7 @@ class DrawController extends Controller
             $users = CheckIn::where('activity_id', $request->activity_id)
                 ->where('is_checked_in', 'true')
                 ->where('is_awarded', 'false')
-                ->whereTime('check_ins.updated_at', '<=', $activity->deadline)
+                // ->whereTime('check_ins.updated_at', '<=', $activity->deadline)
                 ->whereIn('region', $request->region)
                 ->join('departments', 'check_ins.department_id', '=', 'departments.department_id')
                 ->inRandomOrder()
@@ -44,7 +44,7 @@ class DrawController extends Controller
                     array_push($output, [
                         'user_id' => $user->user_id,
                         'user_name' => $user->name,
-                        'department_name' => $user->department_name,
+                        'department_name' => $user->alias,
                     ]);
                 }
                 return $output;

+ 1 - 1
resources/js/src/views/lottery/PrizeList.vue

@@ -105,7 +105,7 @@ export default {
       if (!this.isPause) {
         this.value += 1;
         if (this.value >= 105) {
-          this.shiftPrize(1);CMD
+          this.shiftPrize(1);
         }
       }