Merge branch 'master' of 121.36.198.49:zy_duanju/duanju_manage

modules/Manage/Http/Controllers/MiniprogramController.php

@@ -3,18 +3,21 @@
 namespace Modules\Manage\Http\Controllers;
 
 use Illuminate\Routing\Controller;
+use Catch\Base\CatchController;
 use Illuminate\Http\Request;
 use Modules\Manage\Enmus\MiniprogramType;
 use Modules\Manage\Http\Requests\MiniprogramRequest;
 use Modules\Manage\Http\Requests\MiniprogramUpdateRequest;
 use Modules\Manage\Models\Miniprogram;
+use Modules\Channel\Models\UserHasMiniprograms;
 use Illuminate\Support\Facades\DB;
 use Log;
+use Modules\Channel\Services\User\UserService;
 
-class MiniprogramController extends Controller
+class MiniprogramController extends CatchController
 {
 
-    public function __construct(protected readonly Miniprogram $miniprogram)
+    public function __construct(protected readonly Miniprogram $miniprogram,protected readonly UserHasMiniprograms $userHasMiniprograms)
     {
         
     }
@@ -26,6 +29,7 @@ class MiniprogramController extends Controller
      */
     public function index(Request $request)
     {
+        $uid = $this->getLoginUser()->id;
         $name = $request->get('name');
         $play_name = $request->get('play_name');
         $company = $request->get('company');
@@ -45,8 +49,17 @@ class MiniprogramController extends Controller
         if($type){
             $where[] = ['type','=',$type];
         }
-
-        $result = $this->miniprogram->where($where)->paginate($page_size);
+        if(UserService::userHasRole($uid,'administrator')){
+            $result = $this->miniprogram->where($where)->orderBy('id','desc')->paginate($page_size);
+        }else{
+            $result = $this->userHasMiniprograms->join('miniprogram','miniprogram.id','=','user_has_miniprograms.miniprogram_id')
+            ->where('user_has_miniprograms.is_enabled',1)
+            ->where('uid',$uid)
+            ->where($where)
+            ->select('miniprogram.*')
+            ->paginate($page_size);
+        }
+       
         foreach($result as $item){
             $item->type_name = MiniprogramType::from($item->type)->name();
             $item->status_name = $item->status == 1 ?'启用':'禁用';

modules/Manage/routes/route.php

@@ -12,27 +12,21 @@ Route::prefix('manage')->group(function(){
         ->withoutMiddleware(config('catch.route.middlewares'));
 
         //添加
-        Route::post('store',[MiniprogramController::class,'store'])
-        ->withoutMiddleware(config('catch.route.middlewares'));
+        Route::post('store',[MiniprogramController::class,'store']);
 
         //小程序列表
-        Route::get('index',[MiniprogramController::class,'index'])
-        ->withoutMiddleware(config('catch.route.middlewares'));
+        Route::get('index',[MiniprogramController::class,'index']);
 
         //小程序详情
-        Route::get('show/{id}',[MiniprogramController::class,'show'])
-        ->withoutMiddleware(config('catch.route.middlewares'));
+        Route::get('show/{id}',[MiniprogramController::class,'show']);
 
          //小程序详情
-         Route::post('update/{id}',[MiniprogramController::class,'update'])
-         ->withoutMiddleware(config('catch.route.middlewares'));
+         Route::post('update/{id}',[MiniprogramController::class,'update']);
 
          //小程序分配列表
-         Route::get('allocation/{miniprogram_id}',[UserMiniprogramController::class,'getAllocationInfo'])
-         ->withoutMiddleware(config('catch.route.middlewares'));
+         Route::get('allocation/{miniprogram_id}',[UserMiniprogramController::class,'getAllocationInfo']);
         //分配小程序
-         Route::post('allocation/{miniprogram_id}',[UserMiniprogramController::class,'allocationStore'])
-         ->withoutMiddleware(config('catch.route.middlewares'));
+         Route::post('allocation/{miniprogram_id}',[UserMiniprogramController::class,'allocationStore']);
 
 
         //分配小程序