|
|
@@ -2,7 +2,6 @@
|
|
|
|
|
|
namespace App\Http\Controllers;
|
|
|
|
|
|
-use App\Authority;
|
|
|
use App\Sign;
|
|
|
use App\UserWorkgroup;
|
|
|
use App\Warehouse;
|
|
|
@@ -45,20 +44,10 @@ class UserWorkgroupController extends Controller
|
|
|
'mark'=>$remark,
|
|
|
]);
|
|
|
$sign->save();
|
|
|
- $this->storeAuthority($UserWorkgroup['name'],$UserWorkgroup->id);
|
|
|
app('LogService')->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
|
|
|
return redirect('maintenance/userWorkgroup')->with('successTip','新工作组“'.$request->input('name').'”添加成功');
|
|
|
}
|
|
|
|
|
|
- private function storeAuthority($name,$id){
|
|
|
- Authority::create([
|
|
|
- "name"=>$name,
|
|
|
- "alias_name"=>$name,
|
|
|
- "type"=>"工作组",
|
|
|
- "relevance"=>$id,
|
|
|
- ]);
|
|
|
- }
|
|
|
-
|
|
|
public function edit($id)
|
|
|
{
|
|
|
if(!Gate::allows('工作组-编辑')){ return redirect(url('/')); }
|
|
|
@@ -93,15 +82,6 @@ class UserWorkgroupController extends Controller
|
|
|
}
|
|
|
$userWorkgroup['warehouse_id']= $data['warehouse_id'];
|
|
|
if ($data['name']!=$userWorkgroup->name){
|
|
|
- $authority=Authority::where("name",$userWorkgroup->name)->first();
|
|
|
- if ($authority){
|
|
|
- $authority->name=$data['name'];
|
|
|
- $authority->alias_name=$data['name'];
|
|
|
- $authority->update();
|
|
|
- }
|
|
|
- if (!$authority){
|
|
|
- $this->storeAuthority($data['name'],$id);
|
|
|
- }
|
|
|
$userWorkgroup->fill($data);
|
|
|
$userWorkgroup->update();
|
|
|
app('LogService')->log(__METHOD__,__FUNCTION__,json_encode($request->toArray()),Auth::user()['id']);
|