gx

@@ -30,6 +30,7 @@ class BaseController extends  Controller
     {
         $this->request = $request;
         $this->param = $this->request->all();
+        $this->param['created_at'] = date("YmdHis");
         $this->token = $this->request->header('token');
         $this->get_param();
         $this->auth_token();

@@ -4,6 +4,7 @@ namespace App\Http\Controllers\Bside;
 
 use App\Enums\Common\Code;
 use App\Http\Logic\Bside\ComLogic;
+use App\Models\Project as ProjectModel;
 use App\Models\ProjectMenu as ProjectMenuModel;
 use App\Models\ProjectRole as ProjectRoleModel;
 use Illuminate\Support\Facades\DB;
@@ -81,10 +82,10 @@ class ComController extends BaseController
         foreach ($arr as $k => $v) {
             $v = (array)$v;
             if ($v['pid'] == $my_id) {
-                $new_arr[$k] = $v;
-                $new_arr[$k]['son'] = $this->_get_child($v['id'],$arr);
-            }
+                $v['sub'] = $this->_get_child($v['id'],$arr);
+                $new_arr[] = $v;
 
+            }
         }
         return $new_arr ? $new_arr : false;
     }
@@ -95,6 +96,11 @@ class ComController extends BaseController
      * @method
      */
     public function get_project(){
-
+        $projectModel = new ProjectModel();
+        $info = $projectModel->read(['id'=>$this->user['project_id']]);
+        if(empty($info)){
+            $this->response('error',Code::USER_ERROR);
+        }
+        $this->response('success',Code::SUCCESS,[$info]);
     }
 }

@@ -4,6 +4,7 @@ namespace App\Http\Controllers\Bside;
 
 use App\Enums\Common\Code;
 use App\Models\ProjectRole as ProjectRoleModel;
+use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Validator;
 
 class ProjectRoleController extends BaseController
@@ -44,16 +45,11 @@ class ProjectRoleController extends BaseController
         if($validate->fails()){
             return $this->response($validate->errors()->first(),Code::USER_PARAMS_ERROE,$this->param);
         }
+        $this->param['project_id'] = $this->user['project_id'];
+        //获取当前项目下的角色超级管理员
         $projectRoleModel = new ProjectRoleModel();
         //验证当前角色是否存在
-        if(!isset($this->param['pid'])){
-            $data['pid'] = 0;
-        }
-        $data  = [
-            'name' => $this->param['name'],
-            'pid'  => $this->param['pid'],
-        ];
-        $info = $projectRoleModel->read($data);
+        $info = $projectRoleModel->read(['name'=>$this->param['name']]);
         if(!empty($info)){
             $this->response('当前添加的角色已存在',Code::USER_PARAMS_ERROE);
         }
@@ -76,28 +72,22 @@ class ProjectRoleController extends BaseController
         $rules = [
             'id'=>'required',
             'name'=>'required|max:11',
+            'role_menu'=>'required',
         ];
         //验证的提示信息
         $message = [
             'id.required'=>'主键必须填写',
             'name.required'=>'名称必须填写',
-            'name.max'   =>  '号码不大于11字符.',
+            'role_menu.required'=>'菜单权限列表填写',
         ];
         $validate = Validator::make($this->param, $rules, $message);
         if($validate->fails()){
-            return $this->response($validate->errors()->first(),Code::USER_PARAMS_ERROE,$this->param);
+            return $this->response($validate->errors()->first(),Code::USER_PARAMS_ERROE);
         }
-        //验证当前角色是否存在
-        if(!isset($this->param['pid'])){
-            $data['pid'] = 0;
-        }
-        $data  = [
-            //TODO::自动写入当前用户
-            'name' => $this->param['name'],
-            'pid'  => $this->param['pid'],
-        ];
         $projectRoleModel = new ProjectRoleModel();
-        $info = $projectRoleModel->read($data);
+        //TODO::查询当前名称是否重复
+        $info = DB::table($projectRoleModel->getTable())->where('id','<>',$this->param['id'])
+            ->where(['name'=>$this->param['name'],'project_id'=>$this->user['project_id']])->first();
         if(!empty($info)){
             $this->response('当前添加的角色已存在',Code::USER_PARAMS_ERROE);
         }

@@ -16,13 +16,13 @@ class ComLogic extends BaseLogic
     public function login($param){
         #TODO 查询mobile， 验证密码 true->return; false-> 查询sms发送记录 验证code
         $userModel = new UserModel();
-        if($param['login_method'] == 1){
+        if(!isset($param['login_method'])){
             //密码加密
             $param['password'] = base64_encode(md5($param['password']));
-            $info = $userModel->read(['mobile'=>$param['mobile'],'password'=>$param['password']], ['id','mobile','role_id','project_id','name']);
+            $info = $userModel->read(['mobile'=>$param['mobile'],'password'=>$param['password']], ['*']);
         }else{
             //TODO::验证验证码是否正确
-            $info = $userModel->read(['mobile'=>$param['mobile']],['id','mobile','role_id','project_id','name']);
+            $info = $userModel->read(['mobile'=>$param['mobile']],['*']);
         }
         if(empty($info)){
             return false;
@@ -39,7 +39,11 @@ class ComLogic extends BaseLogic
         Cache::add($token,$info);
         //更新数据库
 
-        $data = $info;
+        $data = [
+            'id'=>$info['id'],
+            'mobile'=>$info['mobile'],
+            'name'=>$info['name']
+        ];
         $rs = $userModel->edit(['token'=>$token],['id'=>$info['id']]);
         if($rs === false){
             return false;

@@ -17,13 +17,21 @@ class Base extends Model
      */
     public function lists($map, $p, $row, $order = 'id', $fields = ['*']){
         //TODO::where(['id'=>'','name'=>''])
-        $lists = DB::table($this->table)->select($fields)->where($map)->forPage($p,$row)->orderBy($order)->get();
+        $lists = $this->select($fields)->where($map)->forPage($p,$row)->orderBy($order)->get();
         if (!empty($lists)) {
+            $lists = $lists->toArray();
             $this->allCount = DB::table($this->table)->where($map)->count();
         }
         return $lists;
     }
 
+    public function list($map,$order = 'id',$fields = ['*']){
+        $lists = $this->select($fields)->where($map)->orderBy($order)->get();
+        if (!empty($lists)) {
+            $lists = $lists->toArray();
+        }
+        return $lists;
+    }
     /**
      * @param array:$condition
      * @name :获取单条数据详情
@@ -33,9 +41,8 @@ class Base extends Model
      */
     public function read($condition,$files = ['*'])
     {
-
-        $info = DB::table($this->table)->select($files)->where($condition)->first();
-        return (array)$info;
+        $info = $this->select($files)->where($condition)->first()->toArray();
+        return $info;
     }
 
     /**
@@ -45,7 +52,9 @@ class Base extends Model
      * @method post
      */
     public function add($data){
-        return DB::table($this->table)->insert($data);
+        $data['created_at'] = date('Y-m-d H:i:s',time());
+        $data['updated_at'] = date('Y-m-d H:i:s',time());
+        return $this->insert($data);
     }
 
     /**
@@ -58,7 +67,8 @@ class Base extends Model
         if(isset($data['id']) && !empty($data['id'])){
             unset($data['id']);
         }
-        return DB::table($this->table)->where($condition)->update($data);
+        $data['updated_at'] = date('Y-m-d H:i:s',time());
+        return $this->where($condition)->update($data);
     }
 
     /**
@@ -68,6 +78,6 @@ class Base extends Model
      * @method
      */
     public function del($condition){
-        return DB::table($this->table)->where($condition)->delete();
+        return $this->where($condition)->delete();
     }
 }

@@ -13,6 +13,9 @@ Route::middleware(['bloginauth'])->group(function () {
 Route::group([], function () {
     Route::any('/login', [\App\Http\Controllers\Bside\ComController::class, 'login'])->name('login');
     Route::any('/get_menu', [\App\Http\Controllers\Bside\ComController::class, 'get_menu'])->name('get_menu');
+    Route::any('/get_project', [\App\Http\Controllers\Bside\ComController::class, 'get_project'])->name('get_project');
     Route::any('/user/lists', [\App\Http\Controllers\Bside\UserController::class, 'lists'])->name('user_lists');
     Route::any('/project/page_lists', [\App\Http\Controllers\Bside\ProjectController::class, 'page_lists'])->name('page_lists');
+    Route::any('/project_role/add', [\App\Http\Controllers\Bside\ProjectRoleController::class, 'add'])->name('project_role_add');
+    Route::any('/project_role/edit', [\App\Http\Controllers\Bside\ProjectRoleController::class, 'edit'])->name('project_role_edit');
 });