Merge branch 'develop' into dc

@@ -7,7 +7,6 @@ use App\Http\Controllers\Aside\BaseController;
 use App\Http\Logic\Aside\User\ProjectRoleLogic;
 use App\Http\Logic\Aside\User\ProjectRoleLogic;
 use App\Http\Requests\Aside\User\ProjectRoleRequest;
 use App\Http\Requests\Aside\User\ProjectRoleRequest;
 use App\Models\User\ProjectRole as ProjectRoleModel;
 use App\Models\User\ProjectRole as ProjectRoleModel;
-use Illuminate\Http\Request;
 
 
 /**
 /**
  * @remark :b端用户角色设置管理
  * @remark :b端用户角色设置管理
@@ -45,7 +44,6 @@ class ProjectRoleController extends BaseController
         ],[
         ],[
             'id.required' => 'ID不能为空'
             'id.required' => 'ID不能为空'
         ]);
         ]);
-        //TODO::详情
         $roleLogic->role_info();
         $roleLogic->role_info();
         $this->response('success');
         $this->response('success');
     }
     }

@@ -2,6 +2,7 @@
 
 
 namespace App\Http\Logic\Aside\User;
 namespace App\Http\Logic\Aside\User;
 
 
+use App\Helper\Common;
 use App\Http\Logic\Aside\BaseLogic;
 use App\Http\Logic\Aside\BaseLogic;
 use App\Models\User\ProjectMenu as ProjectMenuModel;
 use App\Models\User\ProjectMenu as ProjectMenuModel;
 use App\Models\User\ProjectRole;
 use App\Models\User\ProjectRole;
@@ -48,7 +49,15 @@ class ProjectRoleLogic extends BaseLogic
      * @method
      * @method
      */
      */
     public function role_info(){
     public function role_info(){
-        $info = $this->info($this->param);
+        $info = Common::get_user_cache($this->model,$this->param['id'],'A');
+        if(empty($info)){
+            $filed = ['id','name','project_id','operator_id','created_at','status','updated_at'];
+            $info = $this->model->read($this->param,$filed);
+            if($info === false){
+                $this->fail('当前数据不存在');
+            }
+            Common::set_user_cache($info,$this->model,$this->param['id'],'A');
+        }
         return $this->success($info);
         return $this->success($info);
     }
     }
 
 
@@ -83,7 +92,11 @@ class ProjectRoleLogic extends BaseLogic
         if($info !== false){
         if($info !== false){
             $this->fail('当前菜单名称已存在');
             $this->fail('当前菜单名称已存在');
         }
         }
-        $this->edit($this->param,['id'=>$this->param['id']]);
+        $rs = $this->edit($this->param,['id'=>$this->param['id']]);
+        if($rs === false){
+            $this->fail('error');
+        }
+        Common::del_user_cache($this->model,$this->param['id'],'A');
         return $this->success();
         return $this->success();
     }
     }
 
 

@@ -32,8 +32,8 @@ class UserLogic extends BaseLogic
             }
             }
             $info['operator_name'] = (new User())->read(['id'=>$info['operator_id']],['name'])['name'];
             $info['operator_name'] = (new User())->read(['id'=>$info['operator_id']],['name'])['name'];
             $info['project_name'] = (new Project())->read(['id'=>$info['project_id']],['title'])['title'];
             $info['project_name'] = (new Project())->read(['id'=>$info['project_id']],['title'])['title'];
+            Common::set_user_cache($info,$this->model,$this->param['id'],'A');
         }
         }
-        Common::set_user_cache($info,$this->model,$this->param['id'],'A');
         return $this->success($info);
         return $this->success($info);
     }
     }
     /**
     /**