gx

@@ -3,8 +3,12 @@
 namespace App\Http\Controllers\Aside\Com;
 namespace App\Http\Controllers\Aside\Com;
 
 
 use App\Enums\Common\Code;
 use App\Enums\Common\Code;
+use App\Enums\Common\Common;
 use App\Http\Controllers\Aside\BaseController;
 use App\Http\Controllers\Aside\BaseController;
 use App\Http\Logic\Aside\Manage\MenuLogic;
 use App\Http\Logic\Aside\Manage\MenuLogic;
+use App\Models\Manage\Manage;
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\Hash;
 
 
 /**
 /**
  * Class IndexController
  * Class IndexController
@@ -33,4 +37,38 @@ class IndexController extends BaseController
         $this->response('success',Code::SUCCESS,$menus);
         $this->response('success',Code::SUCCESS,$menus);
     }
     }
 
 
+    /**
+     * @remark :修改密码
+     * @name   :editPassword
+     * @author :lyh
+     * @method :post
+     * @time   :2023/9/11 9:10
+     */
+    public function editPassword(){
+        $this->request->validate([
+            'oldPassword'=>'required',
+            'password' => 'required',
+            'confirm'=>'required',
+        ], [
+            'oldPassword.required' => '请输入原密码',
+            'password.required' => '请输入新密码',
+            'confirm.required' => '请再次输入新密码密码',
+        ]);
+        //查询员密码是否正确
+        $managerModel = new Manage();
+        $info = $managerModel->read(['id'=>$this->manage['id']]);
+        if(!Hash::check($this->param['password'], $info['password'])){
+            $this->response('原密码错误',Code::USER_REGISTER_ERROE);
+        }
+        if($this->param['password'] != $this->param['confirm']){
+            $this->response('两次密码不一致');
+        }
+        $rs = $managerModel->edit(['password'=>Hash::make($this->param['password'])],['id'=>$this->manage['id']]);
+        if($rs === false){
+            $this->response('系统错误',Code::SYSTEM_ERROR);
+        }
+        Cache::pull(Common::MANAGE_TOKEN . $info['token']);
+        $this->response('success');
+    }
+
 }
 }

@@ -218,7 +218,7 @@ class HrLogic extends BaseLogic
         $data = [
         $data = [
             'name'=>$name,
             'name'=>$name,
             'mobile'=>$mobile,
             'mobile'=>$mobile,
-            'password'=>Hash::make('123456'),
+            'password'=>Hash::make('globalsov6'),
             'gid'=>4,
             'gid'=>4,
         ];
         ];
         return $managerModel->addReturnId($data);
         return $managerModel->addReturnId($data);

@@ -77,6 +77,8 @@ class MenuSpecialLogic extends BaseLogic
     public function specialSave(){
     public function specialSave(){
         if(isset($this->param['user_list']) && !empty($this->param['user_list'])){
         if(isset($this->param['user_list']) && !empty($this->param['user_list'])){
             $this->param['user_list'] = ','.trim($this->param['user_list'],',').',';
             $this->param['user_list'] = ','.trim($this->param['user_list'],',').',';
+        }else{
+            $this->param['user_list'] = '';
         }
         }
         if(isset($this->param['id']) && !empty($this->param['id'])){
         if(isset($this->param['id']) && !empty($this->param['id'])){
             $rs = $this->model->edit($this->param,['id'=>$this->param['id']]);
             $rs = $this->model->edit($this->param,['id'=>$this->param['id']]);

@@ -10,6 +10,7 @@ use Illuminate\Support\Facades\Route;
 Route::middleware(['aloginauth'])->group(function () {
 Route::middleware(['aloginauth'])->group(function () {
     Route::get('/', [Aside\Com\IndexController::class, 'index'])->name('admin.home.white');
     Route::get('/', [Aside\Com\IndexController::class, 'index'])->name('admin.home.white');
     Route::get('/get_menu', [Aside\Com\IndexController::class, 'get_menu'])->name('admin.get_menu.white');
     Route::get('/get_menu', [Aside\Com\IndexController::class, 'get_menu'])->name('admin.get_menu.white');
+    Route::get('/editPassword', [Aside\Com\IndexController::class, 'editPassword'])->name('admin.editPassword.white');
     Route::get('/logout', [Aside\LoginController::class, 'logout'])->name('admin.logout.white');
     Route::get('/logout', [Aside\LoginController::class, 'logout'])->name('admin.logout.white');
     Route::any('/getAccessAddress', [Aside\LoginController::class, 'getAccessAddress'])->name('admin.getAccessAddress');//获取B端地址
     Route::any('/getAccessAddress', [Aside\LoginController::class, 'getAccessAddress'])->name('admin.getAccessAddress');//获取B端地址
     //会员相关
     //会员相关