gx

@@ -60,7 +60,6 @@ class UserLogic extends BaseLogic
             }
             }
             $this->param = $this->editPassword($this->param);
             $this->param = $this->editPassword($this->param);
             $rs = $this->model->edit($this->param, ['id' => $this->param['id']]);
             $rs = $this->model->edit($this->param, ['id' => $this->param['id']]);
-            DB::table('gl_user_edit_log')->insert(['message'=>json_encode($this->param),'user_id'=>$this->manager['id'],'project_id'=>$info['project_id'],'created_at'=>date('Y-m-d H:i:s'),'updated_at'=>date('Y-m-d H:i:s')]);
         } else {
         } else {
             $this->param['password'] = base64_encode(md5($this->param['password']));
             $this->param['password'] = base64_encode(md5($this->param['password']));
             $rs = $this->model->add($this->param);
             $rs = $this->model->add($this->param);

@@ -4,6 +4,7 @@ namespace App\Http\Logic\Bside\User;
 
 
 use App\Http\Logic\Bside\BaseLogic;
 use App\Http\Logic\Bside\BaseLogic;
 use App\Models\User\DeptUser;
 use App\Models\User\DeptUser;
+use App\Models\User\ProjectRole;
 use App\Models\User\User as UserModel;
 use App\Models\User\User as UserModel;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\DB;
 
 
@@ -12,7 +13,6 @@ class DeptUserLogic extends BaseLogic
     public function __construct()
     public function __construct()
     {
     {
         parent::__construct();
         parent::__construct();
-
         $this->model = new DeptUser();
         $this->model = new DeptUser();
         $this->param = $this->requestAll;
         $this->param = $this->requestAll;
     }
     }
@@ -76,6 +76,11 @@ class DeptUserLogic extends BaseLogic
      * @time   :2023/5/19 9:35
      * @time   :2023/5/19 9:35
      */
      */
     public function user_edit_role(){
     public function user_edit_role(){
+        $roleModel = new ProjectRole();
+        $roleInfo = $roleModel->read(['project_id'=>$this->user['project_id'],'id'=>$this->param['role_id']]);
+        if($roleInfo == false){
+            $this->fail('当前角色id不是当前项目角色');
+        }
         $userModel = new UserModel();
         $userModel = new UserModel();
         $rs = $userModel->edit(['role_id'=>$this->param['role_id']],['id'=>$this->param['id']]);
         $rs = $userModel->edit(['role_id'=>$this->param['role_id']],['id'=>$this->param['id']]);
         if($rs === false){
         if($rs === false){

@@ -85,8 +85,6 @@ class UserLogic extends BaseLogic
         if($rs === false){
         if($rs === false){
             $this->fail('系统错误，请联系管理员');
             $this->fail('系统错误，请联系管理员');
         }
         }
-        //todo::写入日志
-        DB::table('gl_user_edit_log')->insert(['message'=>json_encode($this->param),'user_id'=>$this->user['id'],'project_id'=>$this->user['project_id'],'created_at'=>date('Y-m-d H:i:s'),'updated_at'=>date('Y-m-d H:i:s')]);
         return $this->success();
         return $this->success();
     }
     }