one_after 2 månader sedan
förälder
incheckning
8a1c837d57

+ 2 - 1
app/controller/StreamController.php

@@ -40,7 +40,8 @@
                     if (Arr::get($param, 'mold')) {
                         $query->where('mold', $param['mold']);
                     }
-                })->orderByDesc('id')
+                })->where('source_id','!=',999888111)
+                    ->orderByDesc('id')
                     ->paginate(Arr::get($param,'limit',10),['*'],'page',Arr::get($param,'page'))
                     ->toArray();
 

+ 2 - 0
app/controller/UserController.php

@@ -496,6 +496,8 @@ class UserController
             $time       = time();
             if (!empty($system->sign_award) && $time >= $start_time && $time <= $end_time) {
                 StreamBusiness::addStream($request->user_data['id'], $system->sign_award, streamType2, moldType22, moldTypefild22);
+            }else{
+                StreamBusiness::addStream($request->user_data['id'], 0, streamType2, moldType22, moldTypefild22,999888111);
             }
 
             Db::table('wa_users')->where(['id' => $request->user_data['id']])->update(['continuity' => $continuity]);

+ 1 - 1
plugin/admin/app/controller/StreamController.php

@@ -43,7 +43,7 @@ class StreamController extends Crud
     public function select(Request $request): Response
     {
         $param=$request->all();
-        $data=Stream::query()->where(function ($query)use ($param){
+        $data=Stream::query()->where('source_id','!=',999888111)->where(function ($query)use ($param){
             if(is_numeric(Arr::get($param,'money.1')) &&  is_numeric(Arr::get($param,'money.0'))){
                 $query->whereBetween('money',[$param['money'][0],$param['money'][1]]);
             }elseif (is_numeric(Arr::get($param,'money.0'))){