Browse Source

调用模板

whj 4 years ago
parent
commit
edbf620b00

+ 1 - 1
app/Http/Controllers/Api/mini/DataController.php

xqd
@@ -448,7 +448,7 @@ class DataController extends BaseController
         }
         $orderBy = $request->input('orderBy');
         $items = $items->groupBy('project_id')->selectRaw('sum(money) as sum, project_id')->pluck('sum', 'project_id');
-        $projects = Project::all();
+        $projects = Project::where('id','!=',1)->get();
         foreach ($projects as $project) {
             $project->money = 0;
             foreach ($items as $key => $val) {

+ 1 - 1
app/Http/Controllers/Api/mini/InnerDeviceController.php

xqd
@@ -42,7 +42,7 @@ class InnerDeviceController extends BaseController
 
     public function search(Request $request)
     {
-        $items = $this->model->with('workPoint', 'spec', 'device', 'device_name', 'project');
+        $items = $this->model->with('workPoint', 'spec', 'device', 'project');
         $equal_items = ['device_id', 'device_name_id', 'spec_id'];
         foreach ($equal_items as $item) {
             if($request->input($item)) {

+ 2 - 1
app/Http/Controllers/Api/mini/ProjectController.php

xqd
@@ -67,7 +67,8 @@ class ProjectController extends BaseController
     {
         $user = Auth::guard('mini')->user();
 
-        $items = $user->projects()->where('active', 1);
+        $items = $user->projects()->where('active', 1)->where('project_id','!=',1);
+
         $tmp_items = collect(['name']);
         foreach($tmp_items as $tmp_item) {
             if($request->has($tmp_item) && !empty($request->input($tmp_item))) {

+ 1 - 0
app/Http/Controllers/Api/mini/UserController.php

xqd
@@ -77,6 +77,7 @@ class UserController extends BaseController
         $user = Auth::guard('mini')->user();
 
         $project_role = $user->getTopRole();
+
         if($project_role) {
             $project_role->rights = $project_role->getRights();
         }

+ 6 - 6
app/Models/InnerDevice.php

xqd
@@ -30,12 +30,12 @@ class InnerDevice extends BaseModel
         return $this->belongsTo('App\Models\Device', 'device_id');
     }
 
-    public function device_name()
-    {
-//        return $this->belongsTo('App\Models\DeviceName', 'device_name_id');
-        return $this->hasOne(InnerDeviceNamesModel::class,'id','device_name_id');
-
-    }
+//    public function device_name()
+//    {
+////        return $this->belongsTo('App\Models\DeviceName', 'device_name_id');
+//        return $this->hasOne(InnerDeviceNamesModel::class,'id','device_name_id');
+//
+//    }
 
     public function devices_name(){
         return $this->hasOne(InnerDeviceNamesModel::class,'id','device_name_id');

+ 4 - 0
app/Models/User.php

xqd
@@ -103,6 +103,10 @@ class User extends Authenticatable
     {
         $project_role_ids = ProjectUser::where('user_id', $this['id'])->pluck('project_role_id');
         $project_role = ProjectRole::whereIn('id', $project_role_ids)->orderBy('level', 'desc')->first();
+        $is_manager = ProjectUser::where('user_id',$this['id'])->where(['project_role_id'=>4])->count();
+        if($is_manager){
+            $project_role->key = 'machine';
+        }
         if($project_role) {
             $project_role->rights = $project_role->getRights();
         }