Browse Source

Revert "社区添加增加了事物,优化数据列表排序"

This reverts commit 961ce2f194.
master
lanzu_qsy 5 years ago
parent
commit
16d2a26b78
  1. 6
      app/Admin/Controllers/LanzuCsInfoController.php

6
app/Admin/Controllers/LanzuCsInfoController.php

@ -19,7 +19,6 @@ use Dcat\Admin\Grid;
use Dcat\Admin\Show; use Dcat\Admin\Show;
use Dcat\Admin\Controllers\AdminController; use Dcat\Admin\Controllers\AdminController;
use \App\Models\LanzuCsInfo as modelCsInfo; use \App\Models\LanzuCsInfo as modelCsInfo;
use Illuminate\Support\Facades\DB;
use function foo\func; use function foo\func;
class LanzuCsInfoController extends AdminController class LanzuCsInfoController extends AdminController
@ -32,8 +31,6 @@ class LanzuCsInfoController extends AdminController
protected function grid() protected function grid()
{ {
return Grid::make(new LanzuCsInfo('userBalance'), function (Grid $grid) { return Grid::make(new LanzuCsInfo('userBalance'), function (Grid $grid) {
$grid->model()->orderBy('created_at','desc');
$grid->paginate(10);
$user = Admin::user(); $user = Admin::user();
if ($user->isRole('lanzu_cs')) {//如何是社区站点角色登陆,则只能看到自己的信息 if ($user->isRole('lanzu_cs')) {//如何是社区站点角色登陆,则只能看到自己的信息
$grid->model()->where('admin_user_id', $user->id); $grid->model()->where('admin_user_id', $user->id);
@ -112,7 +109,6 @@ class LanzuCsInfoController extends AdminController
$form->saved(function (Form $form, $cid) { $form->saved(function (Form $form, $cid) {
$model = new modelCsInfo(); $model = new modelCsInfo();
if ($form->isCreating()) { if ($form->isCreating()) {
DB::transaction(function () use ($form, $model, $cid) {
//>>1.添加登录帐号 //>>1.添加登录帐号
$res = Auth::addAdminUser($form, $model, $cid, 'lanzu_cs',3); $res = Auth::addAdminUser($form, $model, $cid, 'lanzu_cs',3);
if ($res == -1) { if ($res == -1) {
@ -135,8 +131,6 @@ class LanzuCsInfoController extends AdminController
$cs->qrcode_path = $fileName; $cs->qrcode_path = $fileName;
$cs->save(); $cs->save();
} }
});
} else { } else {
//>>4.编辑时同步登陆帐号状态 //>>4.编辑时同步登陆帐号状态
$adu = new AdminUsers(); $adu = new AdminUsers();

Loading…
Cancel
Save