wufeng 2 years ago
parent
commit
f2e1a9df05
2 changed files with 2 additions and 2 deletions
  1. 1 1
      app/admin/controller/Role.php
  2. 1 1
      app/admin/route/app.php

+ 1 - 1
app/admin/controller/Role.php

@@ -457,7 +457,7 @@ class Role extends BaseController
 
         $action_data = Db::name("role_process")
             ->where('role_id', $roleid)
-            ->value('action_data');
+            ->value('action_data', []);
 
         $data = PModel::where(['is_del' => PModel::$is_del_normal, 'status' => PModel::$status_normal])
             ->append(['child'])

+ 1 - 1
app/admin/route/app.php

@@ -382,7 +382,7 @@ Route::rule('goodupeditladder','admin/Goodup/editladder');
 Route::rule('goodexam','admin/Goodup/exam');
 Route::rule('goodinfo','admin/Good/info');//商品详情
 Route::rule('againonline','admin/Goodup/againOnline');
-Route::rule('goodupcopy','admin/Goodup/copy');
+Route::rule('goodupcopy','admin/Goodup/copy');//复制商品成本
 Route::rule('goodupedit','admin/Goodup/edit');
 Route::rule('goodupprice','admin/Goodup/checkPrice');
 Route::rule('goodupreject','admin/Goodup/rejectGoodToAgainExamine');