Merge branch 'develop' of ssh://8.134.10.79:222/Leadfyy.co/hainan into develop

app/Admin/Controllers/SupplierController.php

@@ -7,10 +7,12 @@ use App\Admin\Repositories\Supplier;
 use App\Common\ProductStatus;
 use App\Common\UserStatus;
 use App\Models\Product;
+use Dcat\Admin\Admin;
 use Dcat\Admin\Form;
 use Dcat\Admin\Grid;
 use Dcat\Admin\Show;
 use Dcat\Admin\Http\Controllers\AdminController;
+use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Route;
 
 class SupplierController extends AdminController
@@ -150,6 +152,12 @@ class SupplierController extends AdminController
 			if ($form->status == UserStatus::DISABLED) {
 				Product::where('supplier_id', $form->getKey())->update(['status' => ProductStatus::SOLD_OUT]);
 			}
+
+			//插入权限表
+			if ($form->status == UserStatus::NORMAL) {
+				DB::table(config('admin-supplier.database.role_users_table'))
+					->insertOrIgnore(['role_id' => 1, 'user_id' => $form->id]);
+			}
 		});
     }
 }

app/Admin/Extensions/Grid/AuditAgent.php

@@ -111,7 +111,7 @@ class AuditAgent extends RowAction
 			//插入权限表
 			if ($user->status == UserStatus::NORMAL) {
 				DB::table(config('admin-agent.database.role_users_table'))
-					->insertOrIgnore(['role_id' => 1, 'user_id' => Admin::user()->id]);
+					->insertOrIgnore(['role_id' => 1, 'user_id' => $user->id]);
 			}
 
 			//TODO 还需要插入 演示产品、公告、专题等

app/Admin/Extensions/Grid/AuditGuide.php

@@ -43,7 +43,7 @@ class AuditGuide extends RowAction
 			//插入权限表
 			if ($user->status == UserStatus::NORMAL) {
 				DB::table(config('admin-guide.database.role_users_table'))
-					->insertOrIgnore(['role_id' => 1, 'user_id' => Admin::user()->id]);
+					->insertOrIgnore(['role_id' => 1, 'user_id' => $user->id]);
 			}
 
 			return $this->response()->success("审核成功")->refresh();

app/Admin/Extensions/Grid/AuditSupplier.php

@@ -43,7 +43,7 @@ class AuditSupplier extends RowAction
 			//插入权限表
 			if ($user->status == UserStatus::NORMAL) {
 				DB::table(config('admin-supplier.database.role_users_table'))
-					->insertOrIgnore(['role_id' => 1, 'user_id' => Admin::user()->id]);
+					->insertOrIgnore(['role_id' => 1, 'user_id' => $user->id]);
 			}
 
 			return $this->response()->success("审核成功")->refresh();