gx

@@ -22,6 +22,7 @@ class BaseController extends  Controller
     protected $order = 'id';
     protected $order = 'id';
     protected $map = [];//处理后的参数
     protected $map = [];//处理后的参数
     protected $uid = 0;
     protected $uid = 0;
+    protected $user = [];//当前登录用户详情
     /**
     /**
      * 获取所有参数
      * 获取所有参数
      */
      */
@@ -43,6 +44,7 @@ class BaseController extends  Controller
     public function auth_token(){
     public function auth_token(){
         $info = Cache::get($this->token);
         $info = Cache::get($this->token);
         if(isset($info) && !empty($info)){
         if(isset($info) && !empty($info)){
+            $this->user = $info;
             $this->uid = $info['id'];
             $this->uid = $info['id'];
         }
         }
     }
     }
@@ -157,4 +159,26 @@ class BaseController extends  Controller
         $this->header['Per-Page'] = $this->row; //每页条数
         $this->header['Per-Page'] = $this->row; //每页条数
         return $this->header;
         return $this->header;
     }
     }
+
+    /**
+     * @name :上传图片
+     * @return void
+     * @author :liyuhang
+     * @method
+     */
+    public function uploads(){
+        $files = $this->request->file('file');
+        if(empty($files)){
+            return $this->response('没有上传文件',Code::USER_ERROR);
+        }
+        $url = './uploads/images/';
+        $param = $this->request->post();
+        if($this->request->hasFile('image') && $files->isValid()){
+            $filename = date('ymdHis').rand(10000,99999).$this->request->file('image');
+            $this->request->file('image')->move('./uploads/images/',$filename);
+        }else{
+            return false;
+        }
+        return $url.$filename;
+    }
 }
 }

@@ -15,6 +15,7 @@ class ProjectRoleController extends BaseController
      * @method
      * @method
      */
      */
     public function lists(){
     public function lists(){
+        //TODO::根据当前登录用户返回
         $projectRoleModel = new ProjectRoleModel();
         $projectRoleModel = new ProjectRoleModel();
         $lists = $projectRoleModel->lists($this->param,$this->p,$this->row,$this->order);
         $lists = $projectRoleModel->lists($this->param,$this->p,$this->row,$this->order);
         $this->result($lists);
         $this->result($lists);
@@ -27,6 +28,7 @@ class ProjectRoleController extends BaseController
      * @method
      * @method
      */
      */
     public function add(){
     public function add(){
+        //TODO::获取当前用户的所在项目组
         //参数验证
         //参数验证
         $rules = [
         $rules = [
             'name'=>'required|max:11',
             'name'=>'required|max:11',
@@ -69,6 +71,7 @@ class ProjectRoleController extends BaseController
      * @method
      * @method
      */
      */
     public function edit(){
     public function edit(){
+        //TODO::根据当前登录用户返回
         //参数验证
         //参数验证
         $rules = [
         $rules = [
             'id'=>'required',
             'id'=>'required',
@@ -89,6 +92,7 @@ class ProjectRoleController extends BaseController
             $data['pid'] = 0;
             $data['pid'] = 0;
         }
         }
         $data  = [
         $data  = [
+            //TODO::自动写入当前用户
             'name' => $this->param['name'],
             'name' => $this->param['name'],
             'pid'  => $this->param['pid'],
             'pid'  => $this->param['pid'],
         ];
         ];

@@ -93,7 +93,7 @@ class UserController extends BaseController
             return $this->response($validate->errors()->first(),Code::USER_PARAMS_ERROE,$this->param);
             return $this->response($validate->errors()->first(),Code::USER_PARAMS_ERROE,$this->param);
         }
         }
         $userLogic = new UserLogic();
         $userLogic = new UserLogic();
-        $rs = $userLogic->edit($this->param);
+        $rs = $userLogic->edits($this->param);
         if($rs === false){
         if($rs === false){
             $this->response('参数错误或其他服务器原因,编辑失败',Code::USER_ERROR,[]);
             $this->response('参数错误或其他服务器原因,编辑失败',Code::USER_ERROR,[]);
         }
         }
@@ -101,6 +101,34 @@ class UserController extends BaseController
     }
     }
 
 
     /**
     /**
+     * @name :修改当前用户状态
+     * @return void
+     * @author :liyuhang
+     * @method
+     */
+    public function status(){
+        //参数验证
+        $rules = [
+            'id'=>'required',
+            'status'=>'required',
+        ];
+        //验证的提示信息
+        $message = [
+            'id.required'=>'主键必须填写',
+            'status.required'=>'状态必须填写',
+        ];
+        $validate = Validator::make($this->param, $rules, $message);
+        if($validate->fails()){
+            return $this->response($validate->errors()->first(),Code::USER_PARAMS_ERROE,$this->param);
+        }
+        $userLogic = new UserModel();
+        $rs = $userLogic->edit($this->param,['id'=>$this->param['id']]);
+        if($rs === false){
+            $this->response('error',Code::USER_ERROR);
+        }
+        $this->response($this->param['status'] == 0 ? '启用成功' : '禁用成功',Code::SUCCESS);
+    }
+    /**
      * @name :删除管理员
      * @name :删除管理员
      * @return void
      * @return void
      * @author :liyuhang
      * @author :liyuhang

@@ -41,7 +41,7 @@ class UserLogic extends BaseLogic
      * @author :liyuhang
      * @author :liyuhang
      * @method
      * @method
      */
      */
-    public function edit($param){
+    public function edits($param){
         $userModel = new UserModel();
         $userModel = new UserModel();
         //验证当前用户是否存在
         //验证当前用户是否存在
         $info = $userModel->read(['mobile'=>$param['mobile']]);
         $info = $userModel->read(['mobile'=>$param['mobile']]);

@@ -67,7 +67,7 @@ class Base extends Model
      * @author :liyuhang
      * @author :liyuhang
      * @method
      * @method
      */
      */
-    public function del(){
-
+    public function del($condition){
+        return DB::table($this->table)->where($condition)->delete();
     }
     }
 }
 }