Selaa lähdekoodia

【Mod】修复查询分页无效问题

liuxiangxin 2 kuukautta sitten
vanhempi
sitoutus
4bf3b4006a
45 muutettua tiedostoa jossa 48 lisäystä ja 48 poistoa
  1. 1 1
      app/Http/Controllers/Admin/AdminUser.php
  2. 1 1
      app/Http/Controllers/Admin/Business.php
  3. 1 1
      app/Http/Controllers/Admin/ContactWay.php
  4. 1 1
      app/Http/Controllers/Admin/CouponActive.php
  5. 1 1
      app/Http/Controllers/Admin/CouponActiveCoupon.php
  6. 1 1
      app/Http/Controllers/Admin/CouponProduct.php
  7. 1 1
      app/Http/Controllers/Admin/CouponProductExclude.php
  8. 1 1
      app/Http/Controllers/Admin/CouponRewardProduct.php
  9. 1 1
      app/Http/Controllers/Admin/CouponRewardRule.php
  10. 1 1
      app/Http/Controllers/Admin/CustomCompany.php
  11. 1 1
      app/Http/Controllers/Admin/LotteryOrder.php
  12. 1 1
      app/Http/Controllers/Admin/LotteryOrderProduct.php
  13. 1 1
      app/Http/Controllers/Admin/LotteryOrderRecord.php
  14. 1 1
      app/Http/Controllers/Admin/LotteryOrderReward.php
  15. 1 1
      app/Http/Controllers/Admin/LotteryRecruitment.php
  16. 2 2
      app/Http/Controllers/Admin/LotteryRecruitmentRecord.php
  17. 2 2
      app/Http/Controllers/Admin/LotteryRecruitmentReward.php
  18. 1 1
      app/Http/Controllers/Admin/LotteryRiddle.php
  19. 1 1
      app/Http/Controllers/Admin/LotteryRiddleRecord.php
  20. 1 1
      app/Http/Controllers/Admin/LotteryRiddleReward.php
  21. 1 1
      app/Http/Controllers/Admin/LotteryScore.php
  22. 1 1
      app/Http/Controllers/Admin/LotteryScoreRecord.php
  23. 1 1
      app/Http/Controllers/Admin/LotteryScoreReward.php
  24. 1 1
      app/Http/Controllers/Admin/Producer.php
  25. 1 1
      app/Http/Controllers/Admin/PromoProduct.php
  26. 1 1
      app/Http/Controllers/Admin/RecruitmentActive.php
  27. 1 1
      app/Http/Controllers/Admin/RecruitmentRecord.php
  28. 1 1
      app/Http/Controllers/Admin/Regiment.php
  29. 1 1
      app/Http/Controllers/Admin/RegimentActive.php
  30. 2 2
      app/Http/Controllers/Admin/RegimentRecord.php
  31. 1 1
      app/Http/Controllers/Admin/RiddleActive.php
  32. 1 1
      app/Http/Controllers/Admin/RiddleActiveRecord.php
  33. 1 1
      app/Http/Controllers/Admin/RiddleAnswer.php
  34. 1 1
      app/Http/Controllers/Admin/RiddleQuestion.php
  35. 1 1
      app/Http/Controllers/Admin/ScoreClockinActive.php
  36. 1 1
      app/Http/Controllers/Admin/ShareMessage.php
  37. 1 1
      app/Http/Controllers/Admin/VideoAnswer.php
  38. 1 1
      app/Http/Controllers/Admin/VideoExamAnswer.php
  39. 1 1
      app/Http/Controllers/Admin/VideoExamQuestion.php
  40. 1 1
      app/Http/Controllers/Admin/VideoExamRecord.php
  41. 1 1
      app/Http/Controllers/Admin/VideoLearnAnswer.php
  42. 1 1
      app/Http/Controllers/Admin/VideoLearnQuestion.php
  43. 1 1
      app/Http/Controllers/Admin/VideoLearnRecord.php
  44. 1 1
      app/Http/Controllers/Admin/VideoQuestion.php
  45. 1 1
      app/Http/Controllers/Admin/WorkSync.php

+ 1 - 1
app/Http/Controllers/Admin/AdminUser.php

@@ -37,7 +37,7 @@ class AdminUser extends Auth{
             if ($session['business_id']) $map[] = ['admin_rule.business_id','=',$session['business_id']];
         }
  		// 查询系统用户
-		$list						= $Model->query()->join('admin_rule','admin_rule.admin_uid','=','admin.uid','LEFT')->where($map)->orderByDesc('admin.uid')->paginate(config('page_num',10));
+		$list						= $Model->query()->join('admin_rule','admin_rule.admin_uid','=','admin.uid','LEFT')->where($map)->orderByDesc('admin.uid')->paginate(config('page_num',10))->appends(request()->all());
 		// 循环处理
 		foreach ($list as $key => $value) {
 			// 获取分组名

+ 1 - 1
app/Http/Controllers/Admin/Business.php

@@ -63,7 +63,7 @@ class Business extends Auth{
                                 ->where($map)
                                 ->orderByDesc('business.id')
                                 ->select('business.*','company.name as company_name')
-                                ->paginate(config('page_num',10));
+                                ->paginate(config('page_num',10))->appends(request()->all());
 		// 循环处理数据
 		foreach ($list as $key => $value) {
             // id转编号

+ 1 - 1
app/Http/Controllers/Admin/ContactWay.php

@@ -37,7 +37,7 @@ class ContactWay extends Auth{
 		if( $user )				$map[] = ['user','LIKE','%'.$user.'%'];
 		if( $customUid )		$map[] = ['custom_uid','=',$customUid];
 		// 查询数据
-		$list					= $Model->query()->where($map)->orderByDesc('id')->paginate(config('page_num',10));
+		$list					= $Model->query()->where($map)->orderByDesc('id')->paginate(config('page_num',10))->appends(request()->all());
 		// 循环处理数据
 		foreach ($list as $key => $value) {
 			// 接待成员

+ 1 - 1
app/Http/Controllers/Admin/CouponActive.php

@@ -36,7 +36,7 @@ class CouponActive extends Auth{
 		if( $name )				$map[] = ['name','=',$name];
 		// 查询数据
 		$list					= $Model->query()->where($map);
-        $list					= $list->orderByDesc('id')->paginate(config('page_num',10));
+        $list					= $list->orderByDesc('id')->paginate(config('page_num',10))->appends(request()->all());
 		// 循环处理数据
 		foreach ($list as $key => $value) {
 			// 小程序链接

+ 1 - 1
app/Http/Controllers/Admin/CouponActiveCoupon.php

@@ -39,7 +39,7 @@ class CouponActiveCoupon extends Auth{
 									->where($map)
 									->orderByDesc('id')
 									->select(['coupon_active_coupon.*','coupon.name as coupon_name'])
-									->paginate(config('page_num',10));
+									->paginate(config('page_num',10))->appends(request()->all());
 		// 循环处理数据
 		foreach ($list as $key => $value) {
 			// 优惠券编码

+ 1 - 1
app/Http/Controllers/Admin/CouponProduct.php

@@ -41,7 +41,7 @@ class CouponProduct extends Auth{
 									->where($map)
 									->orderByDesc('id')
 									->select(['coupon_product.*','product.name as product_name','coupon.name as coupon_name'])
-									->paginate(config('page_num',10));
+									->paginate(config('page_num',10))->appends(request()->all());
 		// 循环处理数据
 		foreach ($list as $key => $value) {
 			$value['coupon_code'] = $Coupon->idToCode($value['coupon_id']);

+ 1 - 1
app/Http/Controllers/Admin/CouponProductExclude.php

@@ -41,7 +41,7 @@ class CouponProductExclude extends Auth{
 									->where($map)
 									->orderByDesc('id')
 									->select(['coupon_product_exclude.*','product.name as product_name','coupon.name as coupon_name'])
-									->paginate(config('page_num',10));
+									->paginate(config('page_num',10))->appends(request()->all());
 		// 循环处理数据
 		foreach ($list as $key => $value) {
 			$value['coupon_code'] = $Coupon->idToCode($value['coupon_id']);

+ 1 - 1
app/Http/Controllers/Admin/CouponRewardProduct.php

@@ -34,7 +34,7 @@ class CouponRewardProduct extends Auth{
 		if( $rewardRuleId )		$map[] = ['reward_rule_id','=',$rewardRuleId];
 		if( $productId )		$map[] = ['product_id','=',$productId];
 		// 查询数据
-		$list					= $Model->query()->where($map)->orderByDesc('id')->paginate(config('page_num',10));
+		$list					= $Model->query()->where($map)->orderByDesc('id')->paginate(config('page_num',10))->appends(request()->all());
 		// 循环处理数据
 		foreach ($list as $key => $value) {
 			// 产品编码

+ 1 - 1
app/Http/Controllers/Admin/CouponRewardRule.php

@@ -30,7 +30,7 @@ class CouponRewardRule extends Auth{
 		$map 					= [];
 		// 查询数据
 		$list					= $Model->query()->where($map);
-        $list                   = $list->orderByDesc('id')->paginate(config('page_num',10));
+        $list                   = $list->orderByDesc('id')->paginate(config('page_num',10))->appends(request()->all());
 		// 循环处理数据
 		foreach ($list as $key => $value) {
             if($value['coupon_id']){

+ 1 - 1
app/Http/Controllers/Admin/CustomCompany.php

@@ -37,7 +37,7 @@ class CustomCompany extends Auth{
 		// 编码ID
 		if( $uid )				$map[] = ['custom_uid','=',$uid];
 		// 查询数据
-		$list					= $Model->query()->where($map)->orderByDesc('insert_time')->paginate(config('page_num',10));
+		$list					= $Model->query()->where($map)->orderByDesc('insert_time')->paginate(config('page_num',10))->appends(request()->all());
 		// 循环处理数据
 		foreach ($list as $key => $value) {
 			// 客户编码

+ 1 - 1
app/Http/Controllers/Admin/LotteryOrder.php

@@ -34,7 +34,7 @@ class LotteryOrder extends Auth{
 		// 组合条件
 		if( $name )				$map[] = ['name','=',$name];
 		// 查询数据
-		$list					= $Model->query()->where($map)->orderByDesc('id')->paginate(config('page_num',10));
+		$list					= $Model->query()->where($map)->orderByDesc('id')->paginate(config('page_num',10))->appends(request()->all());
 		// 循环处理数据
 		foreach ($list as $key => $value) {
 			// 小程序链接

+ 1 - 1
app/Http/Controllers/Admin/LotteryOrderProduct.php

@@ -34,7 +34,7 @@ class LotteryOrderProduct extends Auth{
 		if( $lotteryId )		$map[] = ['lottery_id','=',$lotteryId];
 		if( $productId )		$map[] = ['product_id','=',$productId];
 		// 查询数据
-		$list					= $Model->query()->where($map)->orderByDesc('id')->paginate(config('page_num',10));
+		$list					= $Model->query()->where($map)->orderByDesc('id')->paginate(config('page_num',10))->appends(request()->all());
 		// 循环处理数据
 		foreach ($list as $key => $value) {
 			// 产品编码

+ 1 - 1
app/Http/Controllers/Admin/LotteryOrderRecord.php

@@ -49,7 +49,7 @@ class LotteryOrderRecord extends Auth{
 								->where($map)
 								->select(['lottery_order_record.*','custom.weiban_extid','custom.username','lottery_order.name as active_name'])
 								->orderByDesc('id')
-								->paginate(config('page_num',10));
+								->paginate(config('page_num',10))->appends(request()->all());
 		// 循环处理数据
 		foreach ($list as $key => $value) {
 			// 组合数据

+ 1 - 1
app/Http/Controllers/Admin/LotteryOrderReward.php

@@ -32,7 +32,7 @@ class LotteryOrderReward extends Auth{
 		if( $lotteryId )		$map[] = ['lottery_id','=',$lotteryId];
 		if( $name )				$map[] = ['reward_name','=',$name];
 		// 查询数据
-		$list					= $Model->query()->where($map)->orderByDesc('id')->paginate(config('page_num',10));
+		$list					= $Model->query()->where($map)->orderByDesc('id')->paginate(config('page_num',10))->appends(request()->all());
 		// 循环处理数据
 		foreach ($list as $key => $value) {
 			// 获取类型名称

+ 1 - 1
app/Http/Controllers/Admin/LotteryRecruitment.php

@@ -33,7 +33,7 @@ class LotteryRecruitment extends Auth{
         // 组合条件
         if( $name )				$map[] = ['name','=',$name];
         // 查询数据
-        $list					= $Model->query()->where($map)->orderByDesc('id')->paginate(config('page_num',10));
+        $list					= $Model->query()->where($map)->orderByDesc('id')->paginate(config('page_num',10))->appends(request()->all());
         // 循环处理数据
         foreach ($list as $key => $value) {
             // 小程序链接

+ 2 - 2
app/Http/Controllers/Admin/LotteryRecruitmentRecord.php

@@ -45,7 +45,7 @@ class LotteryRecruitmentRecord extends Auth{
                                     ->where($map)
                                     ->select(['lottery_recruitment_record.*','custom.weiban_extid','custom.username','lottery_recruitment.name as active_name'])
                                     ->orderByDesc('id')
-                                    ->paginate(config('page_num',10));
+                                    ->paginate(config('page_num',10))->appends(request()->all());
         // 循环处理数据
         foreach ($list as $key => $value) {
             // 组合数据
@@ -152,7 +152,7 @@ class LotteryRecruitmentRecord extends Auth{
 		$excel      		= new \Vtiful\Kernel\Excel(['path' =>public_path().'/uploads/']);
 		$filePath 			= $excel->fileName(uniqid().'.xlsx', 'sheet1')->header(['记录ID','活动ID','活动名称','客户编码','客户昵称','奖品名称','中奖状态','中奖时间','微伴ID'])->data($data)->output();
 		header("Content-Type: application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
-		header('Content-Disposition: attachment;filename="灯谜抽奖中奖记录'.date('Y-m-d His').'.xlsx"');
+		header('Content-Disposition: attachment;filename="新人抽奖中奖记录'.date('Y-m-d His').'.xlsx"');
 		header('Content-Length: ' . filesize($filePath));
 		header('Content-Transfer-Encoding: binary');
 		header('Cache-Control: must-revalidate');

+ 2 - 2
app/Http/Controllers/Admin/LotteryRecruitmentReward.php

@@ -1,6 +1,6 @@
 <?php namespace App\Http\Controllers\Admin;
 
-use App\Http\Requests\Admin\Lottery\OrderReward as Request;
+use App\Http\Requests\Admin\Lottery\RecruitmentReward as Request;
 use App\Models\Coupon;
 use App\Models\Lottery\RecruitmentReward as Model;
 use App\Models\Lottery\Recruitment as LotteryRecruitment;
@@ -32,7 +32,7 @@ class LotteryRecruitmentReward extends Auth{
 		if( $lotteryId )		$map[] = ['lottery_id','=',$lotteryId];
 		if( $name )				$map[] = ['reward_name','=',$name];
 		// 查询数据
-		$list					= $Model->query()->where($map)->orderByDesc('id')->paginate(config('page_num',10));
+		$list					= $Model->query()->where($map)->orderByDesc('id')->paginate(config('page_num',10))->appends(request()->all());
 		// 循环处理数据
 		foreach ($list as $key => $value) {
 			// 获取类型名称

+ 1 - 1
app/Http/Controllers/Admin/LotteryRiddle.php

@@ -34,7 +34,7 @@ class LotteryRiddle extends Auth{
         // 组合条件
         if( $name )				$map[] = ['name','=',$name];
         // 查询数据
-        $list					= $Model->query()->where($map)->orderByDesc('id')->paginate(config('page_num',10));
+        $list					= $Model->query()->where($map)->orderByDesc('id')->paginate(config('page_num',10))->appends(request()->all());
         // 循环处理数据
         foreach ($list as $key => $value) {
             // 小程序链接

+ 1 - 1
app/Http/Controllers/Admin/LotteryRiddleRecord.php

@@ -45,7 +45,7 @@ class LotteryRiddleRecord extends Auth{
                                     ->where($map)
                                     ->select(['lottery_riddle_record.*','custom.weiban_extid','custom.username','lottery_riddle.name as active_name'])
                                     ->orderByDesc('id')
-                                    ->paginate(config('page_num',10));
+                                    ->paginate(config('page_num',10))->appends(request()->all());
         // 循环处理数据
         foreach ($list as $key => $value) {
             // 组合数据

+ 1 - 1
app/Http/Controllers/Admin/LotteryRiddleReward.php

@@ -32,7 +32,7 @@ class LotteryRiddleReward extends Auth{
 		if( $lotteryId )		$map[] = ['lottery_id','=',$lotteryId];
 		if( $name )				$map[] = ['reward_name','=',$name];
 		// 查询数据
-		$list					= $Model->query()->where($map)->orderByDesc('id')->paginate(config('page_num',10));
+		$list					= $Model->query()->where($map)->orderByDesc('id')->paginate(config('page_num',10))->appends(request()->all());
 		// 循环处理数据
 		foreach ($list as $key => $value) {
 			// 获取类型名称

+ 1 - 1
app/Http/Controllers/Admin/LotteryScore.php

@@ -33,7 +33,7 @@ class LotteryScore extends Auth{
 		// 组合条件
 		if( $name )				$map[] = ['name','=',$name];
 		// 查询数据
-		$list					= $Model->query()->where($map)->orderByDesc('id')->paginate(config('page_num',10));
+		$list					= $Model->query()->where($map)->orderByDesc('id')->paginate(config('page_num',10))->appends(request()->all());
 		// 循环处理数据
 		foreach ($list as $key => $value) {
 			// 小程序链接

+ 1 - 1
app/Http/Controllers/Admin/LotteryScoreRecord.php

@@ -49,7 +49,7 @@ class LotteryScoreRecord extends Auth{
 								->where($map)
 								->select(['lottery_score_record.*','custom.weiban_extid','custom.username','lottery_score.name as active_name'])
 								->orderByDesc('id')
-								->paginate(config('page_num',10));
+								->paginate(config('page_num',10))->appends(request()->all());
 		// 循环处理数据
 		foreach ($list as $key => $value) {
 			// 组合数据

+ 1 - 1
app/Http/Controllers/Admin/LotteryScoreReward.php

@@ -32,7 +32,7 @@ class LotteryScoreReward extends Auth{
 		if( $lotteryId )		$map[] = ['lottery_id','=',$lotteryId];
 		if( $name )				$map[] = ['reward_name','=',$name];
 		// 查询数据
-		$list					= $Model->query()->where($map)->orderByDesc('id')->paginate(config('page_num',10));
+		$list					= $Model->query()->where($map)->orderByDesc('id')->paginate(config('page_num',10))->appends(request()->all());
 		// 循环处理数据
 		foreach ($list as $key => $value) {
 			// 获取类型名称

+ 1 - 1
app/Http/Controllers/Admin/Producer.php

@@ -35,7 +35,7 @@ class Producer extends Auth{
 		if( $startTime )		$map[] = ['insert_time','<=',Carbon::createFromFormat('Y-m-d',$startTime)->endOfDay()->getTimestamp()];
 		if( !is_null($status) )	$map[] = ['status','=',$status];
 		// 查询数据
-		$list					= $Model->query()->where($map)->orderByDesc('id')->paginate(config('page_num',10));
+		$list					= $Model->query()->where($map)->orderByDesc('id')->paginate(config('page_num',10))->appends(request()->all());
 		// 循环处理数据
 		foreach ($list as $key => $value) {
 			// 重组

+ 1 - 1
app/Http/Controllers/Admin/PromoProduct.php

@@ -41,7 +41,7 @@ class PromoProduct extends Auth{
 									->where($map)
 									->orderByDesc('id')
 									->select(['promo_product.*','product.name as product_name','promo.name as promo_name'])
-									->paginate(config('page_num',10));
+									->paginate(config('page_num',10))->appends(request()->all());
 		// 循环处理数据
 		foreach ($list as $key => $value) {
 			$value['promo_code'] = $Promo->idToCode($value['promo_id']);

+ 1 - 1
app/Http/Controllers/Admin/RecruitmentActive.php

@@ -50,7 +50,7 @@ class RecruitmentActive extends Auth{
             $map[] = ['end_time','<=',$end_time];
         }
 		// 查询数据
-		$list					= $Model->query()->where($map)->orderByDesc('id')->paginate(config('page_num',10));
+		$list					= $Model->query()->where($map)->orderByDesc('id')->paginate(config('page_num',10))->appends(request()->all());
 		// 循环处理数据
 		foreach ($list as $key => $value) {
 			// 小程序链接

+ 1 - 1
app/Http/Controllers/Admin/RecruitmentRecord.php

@@ -57,7 +57,7 @@ class RecruitmentRecord extends Auth{
             $map[] = ['insert_time','<=',$end_time];
         }
 		// 查询数据
-		$list					= $Model->query()->where($map)->orderByDesc('id')->paginate(config('page_num',10));
+		$list					= $Model->query()->where($map)->orderByDesc('id')->paginate(config('page_num',10))->appends(request()->all());
 		// 循环处理数据
 		foreach ($list as $key => $value) {
             if( $value['old_uid'] ) {

+ 1 - 1
app/Http/Controllers/Admin/Regiment.php

@@ -77,7 +77,7 @@ class Regiment extends Auth{
         $list                   =  $list->where($map)
             ->select($select)
             ->orderByDesc('id')
-            ->paginate(config('page_num',10));
+            ->paginate(config('page_num',10))->appends(request()->all());
         // 循环处理数据
         foreach($list as &$v){
             $v['product_code']  = $Product->idToCode($v['product_id']);

+ 1 - 1
app/Http/Controllers/Admin/RegimentActive.php

@@ -66,7 +66,7 @@ class RegimentActive extends Auth{
         $list					= $list->where($map)
                                 ->select(['regiment_active.*','product.name as product_name'])
                                 ->orderByDesc('regiment_active.id')
-                                ->paginate(config('page_num',10));
+                                ->paginate(config('page_num',10))->appends(request()->all());
         // 循环处理数据
         foreach ($list as &$value) {
             $value['code']	= $Model->idToCode($value['id']);

+ 2 - 2
app/Http/Controllers/Admin/RegimentRecord.php

@@ -85,7 +85,7 @@ class RegimentRecord extends Auth{
         $list					= $list->where($map)
             ->select($select)
             ->orderByDesc('id')
-            ->paginate(config('page_num',10));
+            ->paginate(config('page_num',10))->appends(request()->all());
         // 循环处理数据
         foreach($list as &$v){
             $v['product_code']          = $Product->idToCode($v['product_id']);
@@ -151,7 +151,7 @@ class RegimentRecord extends Auth{
             ->where($map)
             ->select($select)
             ->orderByDesc('id')
-            ->paginate(config('page_num',10));
+            ->paginate(config('page_num',10))->appends(request()->all());
         // 循环处理数据
         foreach($list as &$v){
             $v['product_code']  = $Product->idToCode($v['product_id']);

+ 1 - 1
app/Http/Controllers/Admin/RiddleActive.php

@@ -32,7 +32,7 @@ class RiddleActive extends Auth{
 		// 组合条件
 		if( $name )				$map[] = ['name','=',$name];
 		// 查询数据
-		$list					= $Model->query()->where($map)->orderByDesc('id')->paginate(config('page_num',10));
+		$list					= $Model->query()->where($map)->orderByDesc('id')->paginate(config('page_num',10))->appends(request()->all());
 		// 循环处理数据
 		foreach ($list as $key => $value) {
 			// 小程序链接

+ 1 - 1
app/Http/Controllers/Admin/RiddleActiveRecord.php

@@ -43,7 +43,7 @@ class RiddleActiveRecord extends Auth{
 								->where($map)
 								->select(['riddle_active_record.*','custom.weiban_extid','custom.username','riddle_active.name as active_name'])
 								->orderByDesc('riddle_active_record.id')
-								->paginate(config('page_num',10));
+								->paginate(config('page_num',10))->appends(request()->all());
 		// 循环处理数据
 		foreach ($list as $key => $value) {
 			// id转编号

+ 1 - 1
app/Http/Controllers/Admin/RiddleAnswer.php

@@ -29,7 +29,7 @@ class RiddleAnswer extends Auth{
 		// 组合条件
 		if( $questionId )		$map[] = ['question_id','=',$questionId];
 		// 查询数据
-		$list					= $Model->query()->where($map)->orderByDesc('id')->paginate(config('page_num',10));
+		$list					= $Model->query()->where($map)->orderByDesc('id')->paginate(config('page_num',10))->appends(request()->all());
 		// 循环处理数据
 		foreach ($list as $key => $value) {
 			// 重组

+ 1 - 1
app/Http/Controllers/Admin/RiddleQuestion.php

@@ -29,7 +29,7 @@ class RiddleQuestion extends Auth{
 		// 组合条件
 		if( $name )				$map[] = ['title','=',$name];
 		// 查询数据
-		$list					= $Model->query()->where($map)->orderByDesc('id')->paginate(config('page_num',10));
+		$list					= $Model->query()->where($map)->orderByDesc('id')->paginate(config('page_num',10))->appends(request()->all());
 		// 循环处理数据
 		foreach ($list as $key => $value) {
 			// 重组

+ 1 - 1
app/Http/Controllers/Admin/ScoreClockinActive.php

@@ -35,7 +35,7 @@ class ScoreClockinActive extends Auth{
         // 组合条件
         if( $name )				$map[] = ['name','=',$name];
         // 查询数据
-        $list					= $Model->query()->where($map)->orderByDesc('id')->paginate(config('page_num',10));
+        $list					= $Model->query()->where($map)->orderByDesc('id')->paginate(config('page_num',10))->appends(request()->all());
         // 循环处理数据
         foreach ($list as $key => $value) {
             // 小程序链接

+ 1 - 1
app/Http/Controllers/Admin/ShareMessage.php

@@ -32,7 +32,7 @@ class ShareMessage extends Auth{
 		// 查询条件
 		$map 					= [];
 		// 查询数据
-		$list					= $Model->query()->where($map)->orderByDesc('id')->paginate(config('page_num',10));
+		$list					= $Model->query()->where($map)->orderByDesc('id')->paginate(config('page_num',10))->appends(request()->all());
 		// 循环处理数据
 		foreach($list as $key=>$value){
 			// 产品名称/活动名称

+ 1 - 1
app/Http/Controllers/Admin/VideoAnswer.php

@@ -29,7 +29,7 @@ class VideoAnswer extends Auth{
 		// 组合条件
 		if( $questionId )		$map[] = ['question_id','=',$questionId];
 		// 查询数据
-		$list					= $Model->query()->where($map)->orderByDesc('id')->paginate(config('page_num',10));
+		$list					= $Model->query()->where($map)->orderByDesc('id')->paginate(config('page_num',10))->appends(request()->all());
 		// 循环处理数据
 		foreach ($list as $key => $value) {
 			// 重组

+ 1 - 1
app/Http/Controllers/Admin/VideoExamAnswer.php

@@ -44,7 +44,7 @@ class VideoExamAnswer extends Auth{
 									->join('video_course','video_course.id','=','video_exam_answer.course_id')
 									->join('custom','custom.uid','=','video_exam_answer.custom_uid')
 									->where($map)->select(['video_exam_answer.*','video_course.name as course_name','custom.username as custom_name'])
-									->orderByDesc('id')->paginate(config('page_num',10));
+									->orderByDesc('id')->paginate(config('page_num',10))->appends(request()->all());
 		// 循环处理数据
 		foreach ($list as $key => $value) {
 			// 时间

+ 1 - 1
app/Http/Controllers/Admin/VideoExamQuestion.php

@@ -38,7 +38,7 @@ class VideoExamQuestion extends Auth{
 									->join('video_course','video_course.id','=','video_exam_question.course_id')
 									->join('video_question','video_question.id','=','video_exam_question.question_id')
 									->where($map)->select(['video_exam_question.*','video_course.name as course_name','video_question.title as question_title'])
-									->orderBy('video_exam_question.id')->paginate(config('page_num',10));
+									->orderBy('video_exam_question.id')->paginate(config('page_num',10))->appends(request()->all());
 		// 循环处理数据
 		foreach ($list as $key => $value) {
 			// 重组

+ 1 - 1
app/Http/Controllers/Admin/VideoExamRecord.php

@@ -41,7 +41,7 @@ class VideoExamRecord extends Auth{
 									->join('video_course','video_course.id','=','video_exam_record.course_id')
 									->join('custom','custom.uid','=','video_exam_record.custom_uid')
 									->where($map)->select(['video_exam_record.*','video_course.name as course_name','custom.username as custom_name'])
-									->orderByDesc('id')->paginate(config('page_num',10));
+									->orderByDesc('id')->paginate(config('page_num',10))->appends(request()->all());
 		// 循环处理数据
 		foreach ($list as $key => $value) {
 			// 时间

+ 1 - 1
app/Http/Controllers/Admin/VideoLearnAnswer.php

@@ -44,7 +44,7 @@ class VideoLearnAnswer extends Auth{
 									->join('video_course','video_course.id','=','video_learn_answer.course_id')
 									->join('custom','custom.uid','=','video_learn_answer.custom_uid')
 									->where($map)->select(['video_learn_answer.*','video_course.name as course_name','custom.username as custom_name'])
-									->orderByDesc('id')->paginate(config('page_num',10));
+									->orderByDesc('id')->paginate(config('page_num',10))->appends(request()->all());
 		// 循环处理数据
 		foreach ($list as $key => $value) {
 			// 时间

+ 1 - 1
app/Http/Controllers/Admin/VideoLearnQuestion.php

@@ -38,7 +38,7 @@ class VideoLearnQuestion extends Auth{
 									->join('video_course','video_course.id','=','video_learn_question.course_id')
 									->join('video_question','video_question.id','=','video_learn_question.question_id')
 									->where($map)->select(['video_learn_question.*','video_course.name as course_name','video_question.title as question_title'])
-									->orderBy('video_learn_question.play_time')->paginate(config('page_num',10));
+									->orderBy('video_learn_question.play_time')->paginate(config('page_num',10))->appends(request()->all());
 		// 循环处理数据
 		foreach ($list as $key => $value) {
 			// 出题时间

+ 1 - 1
app/Http/Controllers/Admin/VideoLearnRecord.php

@@ -41,7 +41,7 @@ class VideoLearnRecord extends Auth{
 									->join('video_course','video_course.id','=','video_learn_record.course_id')
 									->join('custom','custom.uid','=','video_learn_record.custom_uid')
 									->where($map)->select(['video_learn_record.*','video_course.name as course_name','custom.username as custom_name'])
-									->orderByDesc('id')->paginate(config('page_num',10));
+									->orderByDesc('id')->paginate(config('page_num',10))->appends(request()->all());
 		// 循环处理数据
 		foreach ($list as $key => $value) {
 			// 时间

+ 1 - 1
app/Http/Controllers/Admin/VideoQuestion.php

@@ -29,7 +29,7 @@ class VideoQuestion extends Auth{
 		// 组合条件
 		if( $name )				$map[] = ['title','=',$name];
 		// 查询数据
-		$list					= $Model->query()->where($map)->orderByDesc('id')->paginate(config('page_num',10));
+		$list					= $Model->query()->where($map)->orderByDesc('id')->paginate(config('page_num',10))->appends(request()->all());
 		// 循环处理数据
 		foreach ($list as $key => $value) {
 			// 重组

+ 1 - 1
app/Http/Controllers/Admin/WorkSync.php

@@ -32,7 +32,7 @@ class WorkSync extends Auth{
 		// 查询条件
 		$map 					= [];
 		// 查询数据
-		$list					= $Model->query()->where($map)->orderByDesc('id')->paginate(config('page_num',10));
+		$list					= $Model->query()->where($map)->orderByDesc('id')->paginate(config('page_num',10))->appends(request()->all());
 		// 分配数据
 		$this->assign('empty', '<tr><td colspan="20">~~暂无数据</td></tr>');
 		$this->assign('list',$list);